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

- attempt to clean up the behavior when you run bochs from the

Browse Source 
command line or by double clicking.  Running from the command
  line doesn't really work because of a NULL pointer problem in
  gui/carbon.cc.
This commit is contained in:
Bryce Denney 2001-09-27 02:54:06 +00:00
parent e25de5fce0
commit 742830f1ab
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bochs/main.cc
View File

@ -21,11 +21,12 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "bochs.h" #include "bochs.h"
#include <assert.h> #include <assert.h>
#include "state_file.h" #include "state_file.h"
int force_no_control_panel = 0;
extern "C" { extern "C" {
#include <signal.h> #include <signal.h>
} }
@ -770,19 +771,30 @@ main(int argc, char *argv[])
#if BX_WITH_CARBON #if BX_WITH_CARBON
/* This is passed if we are launched by double-clicking */ /* This is passed if we are launched by double-clicking */
if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) {
argc = 1; io->init_log("/tmp/early-bochs-out.txt");
BX_INFO (("I was launched by double clicking. Fixing home directory."));
argc = 1;
setupWorkingDirectory (argv[0]);
force_no_control_panel = 1;
}
for (int a=0; a<argc; a++) {
BX_INFO (("argument %d is %s", a, argv[a]));
}
setupWorkingDirectory (argv[0]); char cwd[MAXPATHLEN];
getwd (cwd);
BX_INFO (("Now my working directory is %s", cwd));
#endif #endif
int read_rc_already = 0; int read_rc_already = 0;
init_siminterface (); init_siminterface ();
bx_init_options (); bx_init_options ();
#if BX_USE_CONTROL_PANEL #if BX_USE_CONTROL_PANEL
if (argc > 1 && (!strcmp ("-nocontrolpanel", argv[1]))) { if (force_no_control_panel) {
SIM->set_enabled (0);
} if (argc > 1 && (!strcmp ("-nocontrolpanel", argv[1]))) {
// skip the control panel // skip the control panel
argc++; argc++;
SIM->set_enabled (0); SIM->set_enabled (0);