Stupid bug: using LastError() instead of Error()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -69,7 +69,8 @@ bool wxProtocol::Reconnect()
|
|||||||
{
|
{
|
||||||
wxIPV4address addr;
|
wxIPV4address addr;
|
||||||
|
|
||||||
if (!GetPeer(addr)) {
|
if (!GetPeer(addr))
|
||||||
|
{
|
||||||
Close();
|
Close();
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
@@ -77,6 +78,7 @@ bool wxProtocol::Reconnect()
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
if (!Connect(addr))
|
if (!Connect(addr))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -88,7 +90,7 @@ wxProtocolError GetLine(wxSocketBase *sock, wxString& result) {
|
|||||||
bool found;
|
bool found;
|
||||||
|
|
||||||
avail = sock->Read(tmp_buf, PROTO_BSIZE).LastCount();
|
avail = sock->Read(tmp_buf, PROTO_BSIZE).LastCount();
|
||||||
if (sock->LastError() != 0 || avail == 0)
|
if (sock->Error() || avail == 0)
|
||||||
return wxPROTO_NETERR;
|
return wxPROTO_NETERR;
|
||||||
|
|
||||||
memcpy(tmp_str, tmp_buf, avail);
|
memcpy(tmp_str, tmp_buf, avail);
|
||||||
|
Reference in New Issue
Block a user