Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- MGR: Make sure the UI thread doesn't call a GUI RPC 

that uses the SET_LOCALE class.
        
    clientgui/
        BOINCClientManager.cpp

svn path=/trunk/boinc/; revision=16971
This commit is contained in:
Rom Walton 2009-01-21 23:08:32 +00:00
parent 7cbce5f2ec
commit c57c8b63bc
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
checkin_notes
View File

@ -544,3 +544,10 @@ David 21 Jan 2009
client/ client/
work_fetch.cpp,h work_fetch.cpp,h
Rom 21 Jan 2009
- MGR: Make sure the UI thread doesn't call a GUI RPC
that uses the SET_LOCALE class.
clientgui/
BOINCClientManager.cpp

10
clientgui/BOINCClientManager.cpp
View File

@ -112,7 +112,6 @@ bool CBOINCClientManager::IsBOINCCoreRunning() {
int retval=0; int retval=0;
bool running = false; bool running = false;
HOST_INFO hostinfo;
RPC_CLIENT rpc; RPC_CLIENT rpc;
#ifdef __WXMSW__ #ifdef __WXMSW__
@ -124,9 +123,14 @@ bool CBOINCClientManager::IsBOINCCoreRunning() {
for (int i=0; i<10; i++) { for (int i=0; i<10; i++) {
retval = rpc.init("localhost"); // synchronous is OK since local retval = rpc.init("localhost"); // synchronous is OK since local
wxLogTrace(wxT("Function Status"), wxT("CBOINCClientManager::IsBOINCCoreRunning - Connecting to core client returned '%d'"), retval); wxLogTrace(wxT("Function Status"), wxT("CBOINCClientManager::IsBOINCCoreRunning - Connecting to core client returned '%d'"), retval);
retval = rpc.get_host_info(hostinfo); retval = rpc.authorize(wxT("")); // Do not use an RPC that uses the SET_LOCALE class, this
// function is typically called from the UI thread. If the
// UI thread and the async thread happen to use SET_LOCALE
// at the same time there is a 50% chance that the UI will
// be partially suck using the "C" locale which is needed to
// parse the data coming back from the CC.
wxLogTrace(wxT("Function Status"), wxT("CBOINCClientManager::IsBOINCCoreRunning - Requesting host info... retval '%d'"), retval); wxLogTrace(wxT("Function Status"), wxT("CBOINCClientManager::IsBOINCCoreRunning - Requesting host info... retval '%d'"), retval);
running = (retval == 0); running = (retval != ERR_CONNECT);
rpc.close(); rpc.close();
if (running) break; if (running) break;
if (!IsBOINCConfiguredAsDaemon()) break; if (!IsBOINCConfiguredAsDaemon()) break;