ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WX: Somewhat fix lan link. Advance wars won't link properly whereas it is working with mem link.

This commit is contained in:
bgk 2012-09-02 14:26:22 +00:00
parent cf02712b34
commit 00791f6801
1 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/wx/guiinit.cpp
View File

@ -121,19 +121,25 @@ public:
sig->Signal();
lock->Unlock();
}
} sid(&lock, &sig, &connmsg, &pmsg, &done);
if(!ls.Init(&sid)) {
wxLogError(_("Error occurred.\nPlease try again."));
lock.Unlock();
return;
};
sid_t* sid = new sid_t(&lock, &sig, &connmsg, &pmsg, &done);
if (!ls.Init(sid)) {
wxLogError(_("Error occurred.\nPlease try again."));
lock.Unlock();
delete sid;
return;
}
wxProgressDialog
pdlg(_("Waiting for clients..."), connmsg,
100, dlg, wxPD_APP_MODAL|wxPD_CAN_ABORT|wxPD_ELAPSED_TIME);
while(!done) {
if(!pdlg.Pulse(connmsg + pmsg))
done = true;
sig.Wait();
if(!pdlg.Pulse(connmsg + pmsg))
done = true;
sig.Wait();
}
} else {
class cid_t : public ClientInfoDisplay
@ -175,21 +181,25 @@ public:
sig->Signal();
lock->Unlock();
}
} cid(&lock, &sig, &connmsg, &pmsg, &done);
int err;
if((err = lc.Init(sf::IPAddress(std::string(gopts.link_host.mb_str())),
&cid))) {
wxLogError(_("Error %d occurred.\nPlease try again."), err);
lock.Unlock();
return;
};
cid_t* cid = new cid_t(&lock, &sig, &connmsg, &pmsg, &done);
if (!lc.Init(sf::IPAddress(std::string(gopts.link_host.mb_str())), cid)) {
wxLogError(_("Error occurred.\nPlease try again."));
lock.Unlock();
delete cid;
return;
}
wxProgressDialog
pdlg(_("Waiting for connection..."), connmsg,
100, dlg, wxPD_APP_MODAL|wxPD_CAN_ABORT|wxPD_ELAPSED_TIME);
while(!done) {
if(!pdlg.Pulse(connmsg + pmsg))
done = true;
sig.Wait();
if(!pdlg.Pulse(connmsg + pmsg))
done = true;
sig.Wait();
}
}
lock.Unlock();