Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't call wxSocketBase::IsInitialized() from worker threads.

Browse Source 
This function should be used in the main thread only and calling it from
wxSockAddress unconditionally resulted in asserts in the unit test.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-09-21 14:45:45 +00:00
parent 884ca4e484
commit ed2e973e9f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/sckaddr.cpp
View File

@@ -31,6 +31,7 @@
#include "wx/object.h" #include "wx/object.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/thread.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -734,7 +735,7 @@ int wxSockAddress::GetAddressDataLen() const
void wxSockAddress::Init() void wxSockAddress::Init()
{ {
if ( !wxSocketBase::IsInitialized() ) if ( wxIsMainThread() && !wxSocketBase::IsInitialized() )
{ {
// we must do it before using any socket functions // we must do it before using any socket functions
(void)wxSocketBase::Initialize(); (void)wxSocketBase::Initialize();