From 44098d90e624df0e109e7cada27a6b948be975cc Mon Sep 17 00:00:00 2001 From: Volker Ruppert Date: Sat, 14 Jul 2012 15:48:48 +0000 Subject: [PATCH] - fixed location of optional plugin load / unload calls --- bochs/main.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bochs/main.cc b/bochs/main.cc index a3dc46375..fa4ce4d87 100644 --- a/bochs/main.cc +++ b/bochs/main.cc @@ -806,9 +806,9 @@ int bx_init_main(int argc, char *argv[]) load_rcfile = 0; norcfile = 0; } + // load pre-defined optional plugins before parsing configuration + SIM->opt_plugin_ctrl("*", 1); if (load_rcfile) { - // load pre-defined optional plugins before parsing configuration - SIM->opt_plugin_ctrl("*", 1); // parse configuration file and command line arguments #ifdef WIN32 int length; @@ -1316,6 +1316,8 @@ void bx_init_hardware() #endif DEV_init_devices(); + // unload optional plugins which are unused and marked for removal + SIM->opt_plugin_ctrl("*", 0); bx_pc_system.register_state(); DEV_register_state(); if (SIM->get_param_bool(BXPN_RESTORE_FLAG)->get()) { @@ -1324,8 +1326,6 @@ void bx_init_hardware() SIM->get_param_bool(BXPN_RESTORE_FLAG)->set(0); } } else { - // unload optional plugins which are unused and marked for removal - SIM->opt_plugin_ctrl("*", 0); bx_set_log_actions_by_device(1); }