fixed bug with calling Destroy() on the NULL wxSocket
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -29,7 +29,7 @@
|
|||||||
# pragma hdrstop
|
# pragma hdrstop
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// for all others, include the necessary headers
|
// for all others, include the necessary headers
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
# include "wx/wx.h"
|
# include "wx/wx.h"
|
||||||
#endif
|
#endif
|
||||||
@@ -216,7 +216,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
|
|||||||
|
|
||||||
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
|
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
|
||||||
{
|
{
|
||||||
wxMessageBox(_("wxSocket demo: Server\n"
|
wxMessageBox(_("wxSocket demo: Server\n"
|
||||||
"(c) 1999 Guillermo Rodriguez Garcia\n"),
|
"(c) 1999 Guillermo Rodriguez Garcia\n"),
|
||||||
_("About Server"),
|
_("About Server"),
|
||||||
wxOK | wxICON_INFORMATION, this);
|
wxOK | wxICON_INFORMATION, this);
|
||||||
@@ -287,7 +287,7 @@ void MyFrame::Test3(wxSocketBase *sock)
|
|||||||
|
|
||||||
m_text->AppendText(_("Test 3 begins\n"));
|
m_text->AppendText(_("Test 3 begins\n"));
|
||||||
|
|
||||||
// This test is similar to the first one, but the len is
|
// This test is similar to the first one, but the len is
|
||||||
// expressed in kbytes - this tests large data transfers.
|
// expressed in kbytes - this tests large data transfers.
|
||||||
|
|
||||||
sock->SetFlags(wxSOCKET_WAITALL);
|
sock->SetFlags(wxSOCKET_WAITALL);
|
||||||
@@ -334,7 +334,6 @@ void MyFrame::OnServerEvent(wxSocketEvent& event)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_text->AppendText(_("Error: couldn't accept a new connection\n\n"));
|
m_text->AppendText(_("Error: couldn't accept a new connection\n\n"));
|
||||||
sock->Destroy();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user