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

fixed deadlock in second simulation after exiting the first one with the power button

Browse Source
This commit is contained in:
Volker Ruppert 2013-02-19 19:12:44 +00:00
parent 9c3d374e6a
commit 209b8c9ff8
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bochs/gui/wx.cc
View File

@ -115,7 +115,7 @@ static struct {
} wxBochsPalette[256];
wxCriticalSection event_thread_lock;
BxEvent event_queue[MAX_EVENTS];
unsigned long num_events = 0;
unsigned long num_events;
static bx_bool mouse_captured = 0;
static bx_bool wx_hide_ips = 0;
#if defined (wxHAS_RAW_KEY_CODES) && defined(__WXGTK__)
@ -918,10 +918,6 @@ bx_bool MyPanel::fillBxKeyEvent(wxKeyEvent& wxev, BxKeyEvent& bxev, bx_bool rele
return true;
}
//////////////////////////////////////////////////////////////
// fill in methods of bx_gui
//////////////////////////////////////////////////////////////
#if defined(WIN32) && BX_DEBUGGER && BX_DEBUGGER_GUI
DWORD WINAPI DebugGuiThread(LPVOID)
{
@ -936,6 +932,10 @@ DWORD WINAPI DebugGuiThread(LPVOID)
}
#endif
//////////////////////////////////////////////////////////////
// fill in methods of bx_gui
//////////////////////////////////////////////////////////////
void bx_wx_gui_c::specific_init(int argc, char **argv, unsigned headerbar_y)
{
int b,i,j;
@ -1015,6 +1015,11 @@ void bx_wx_gui_c::specific_init(int argc, char **argv, unsigned headerbar_y)
#endif
#endif
num_events = 0;
// When exiting simulation with the power button, the event thread lock is
// still active, since power_handler() never returns.
event_thread_lock.Leave();
new_gfx_api = 1;
dialog_caps = BX_GUI_DLG_USER | BX_GUI_DLG_SNAPSHOT | BX_GUI_DLG_SAVE_RESTORE;
}