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

In restore mode load config earlier to make config interface selection work (fixes issue #37).

Browse Source
This commit is contained in:
Volker Ruppert 2023-11-03 18:19:38 +01:00
parent 2ea60efe00
commit ae31d06147
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bochs/main.cc
View File

@ -2,7 +2,7 @@
// $Id$ // $Id$
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001-2021 The Bochs Project // Copyright (C) 2001-2023 The Bochs Project
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -911,11 +911,13 @@ int bx_init_main(int argc, char *argv[])
} }
if (SIM->get_param_bool(BXPN_RESTORE_FLAG)->get()) { if (SIM->get_param_bool(BXPN_RESTORE_FLAG)->get()) {
if (!SIM->restore_config()) {
BX_PANIC(("cannot restore configuration"));
}
if (arg < argc) { if (arg < argc) {
BX_ERROR(("WARNING: bochsrc options are ignored in restore mode!")); BX_ERROR(("WARNING: bochsrc options are ignored in restore mode!"));
} }
} } else {
else {
// parse the rest of the command line. This is done after reading the // parse the rest of the command line. This is done after reading the
// configuration file so that the command line arguments can override // configuration file so that the command line arguments can override
// the settings from the file. // the settings from the file.
@ -974,12 +976,7 @@ bool load_and_init_display_lib(void)
int bx_begin_simulation(int argc, char *argv[]) int bx_begin_simulation(int argc, char *argv[])
{ {
bx_user_quit = 0; bx_user_quit = 0;
if (SIM->get_param_bool(BXPN_RESTORE_FLAG)->get()) { if (!SIM->get_param_bool(BXPN_RESTORE_FLAG)->get()) {
if (!SIM->restore_config()) {
BX_PANIC(("cannot restore configuration"));
SIM->get_param_bool(BXPN_RESTORE_FLAG)->set(0);
}
} else {
// make sure all optional plugins have been loaded // make sure all optional plugins have been loaded
SIM->opt_plugin_ctrl("*", 1); SIM->opt_plugin_ctrl("*", 1);
} }