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

- move call to update_drive_status_buttons until after hardware init.

Browse Source 
Before when the debugger was enabled, the update function was called
  before hardware init leading to a panic.

Modified Files:
main.cc debug/dbg_main.cc
This commit is contained in:
Bryce Denney 2002-11-20 19:34:51 +00:00
parent bd6e7b0ff1
commit 919e8a3575
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/debug/dbg_main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: dbg_main.cc,v 1.91 2002-11-19 18:56:38 vruppert Exp $
// $Id: dbg_main.cc,v 1.92 2002-11-20 19:34:51 bdenney Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -387,6 +387,10 @@ process_sim2:
DEV_reset_devices(BX_RESET_HARDWARE);
SIM->set_init_done (1);
// update headerbar buttons since drive status can change during init
bx_gui->update_drive_status_buttons ();
bx_gui->init_signal_handlers ();
bx_pc_system.start_timers();

8
bochs/main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: main.cc,v 1.187 2002-11-20 13:08:17 bdenney Exp $
// $Id: main.cc,v 1.188 2002-11-20 19:34:50 bdenney Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -1880,6 +1880,9 @@ bx_begin_simulation (int argc, char *argv[])
SIM->set_init_done (1);
// update headerbar buttons since drive status can change during init
bx_gui->update_drive_status_buttons ();
// The set handler for mouse_enabled does not actually update the gui
// until init_done is set. This forces the set handler to be called,
// which sets up the mouse enabled GUI-specific stuff correctly.
@ -2056,9 +2059,6 @@ bx_init_hardware()
alarm( 1 );
#endif
// update headerbar buttons since drive status can change during init
bx_gui->update_drive_status_buttons ();
return(0);
}