From b39a1d7729d05aa4a835faf4a04d412b1dcd8368 Mon Sep 17 00:00:00 2001 From: nigel <> Date: Tue, 25 Mar 2003 01:44:16 +0000 Subject: [PATCH] Extra warning for ROM path not set, try to terminate in QuitEmulator() --- BasiliskII/src/MacOSX/main_macosx.mm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/BasiliskII/src/MacOSX/main_macosx.mm b/BasiliskII/src/MacOSX/main_macosx.mm index a8da7142..5481246c 100644 --- a/BasiliskII/src/MacOSX/main_macosx.mm +++ b/BasiliskII/src/MacOSX/main_macosx.mm @@ -269,6 +269,8 @@ bool InitEmulator (void) // Get rom file path from preferences const char *rom_path = PrefsFindString("rom"); + if ( ! rom_path ) + WarningAlert("No rom pathname set. Trying ./ROM"); // Load Mac ROM int rom_fd = open(rom_path ? rom_path : ROM_FILE_NAME, O_RDONLY); @@ -318,9 +320,6 @@ bool InitEmulator (void) void QuitEmuNoExit() { -// extern NSApplication *NSApp; - - D(bug("QuitEmulator\n")); // Exit 680x0 emulation @@ -361,14 +360,18 @@ void QuitEmuNoExit() // Exit preferences PrefsExit(); - - // Stop run loop? - //[NSApp terminate: nil]; } void QuitEmulator(void) { + extern NSApplication *NSApp; + + QuitEmuNoExit(); + + // Stop run loop? + [NSApp terminate: nil]; + exit(0); }