mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- be a little more careful with thread checks in ToggleMouse to fix

Browse Source 
bug [ 652358 ] wx: middle button before sim freezes
This commit is contained in:
Bryce Denney 2002-12-11 22:55:18 +00:00
parent 9e0aa82ec9
commit 496fcb2212
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bochs/gui/wx.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////
// $Id: wx.cc,v 1.51 2002-11-19 05:47:44 bdenney Exp $
// $Id: wx.cc,v 1.52 2002-12-11 22:55:14 bdenney Exp $
/////////////////////////////////////////////////////////////////
//
// wxWindows VGA display for Bochs. wx.cc implements a custom
@ -171,7 +171,8 @@ void MyPanel::ToggleMouse (bool fromToolbar)
static bool first_enable = true;
bx_param_bool_c *enable = SIM->get_param_bool (BXP_MOUSE_ENABLED);
bool en = ! enable->get ();
bool needmutex = SIM->is_sim_thread ();
bool is_main_thread = wxThread::IsMain ();
bool needmutex = !is_main_thread && SIM->is_sim_thread ();
if (needmutex) wxMutexGuiEnter();
if (fromToolbar && first_enable && en) {
// only show this help if you click on the toolbar. If they already

3
bochs/gui/wxmain.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////
// $Id: wxmain.cc,v 1.82 2002-12-11 22:35:45 bdenney Exp $
// $Id: wxmain.cc,v 1.83 2002-12-11 22:55:18 bdenney Exp $
/////////////////////////////////////////////////////////////////
//
// wxmain.cc implements the wxWindows frame, toolbar, menus, and dialogs.
@ -97,6 +97,7 @@ MyPanel *thePanel = NULL;
bool wxBochsClosing = false;
bool isSimThread () {
if (wxThread::IsMain()) return false;
wxThread *current = wxThread::This ();
if (current == (wxThread*) theFrame->GetSimThread ()) {
//wxLogDebug ("isSimThread? yes");