From 90fc4a0ccb34cf2379882ff255efef790ae10e0d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 4 Oct 2004 10:52:32 +0000 Subject: [PATCH] don't use non blocking sockets if wxApp::IsMainLoopRunnning() returns false (closes 994293) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/http.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/http.cpp b/src/common/http.cpp index 990e08e276..d65d37f9cb 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -232,11 +232,11 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) SetHeader(wxT("User-Agent"), wxT("wxWidgets 2.x")); SaveState(); -#if wxUSE_THREADS - SetFlags( wxThread::IsMain() ? wxSOCKET_NONE : wxSOCKET_BLOCK ); -#else - SetFlags( wxSOCKET_NONE ); -#endif + + // we may use non blocking sockets only if we can dispatch events from them + SetFlags( wxIsMainThread() && (wxTheApp && wxTheApp->IsMainLoopRunning()) + ? wxSOCKET_NONE + : wxSOCKET_BLOCK ); Notify(false); wxString buf; -- 2.45.2