mirror of
https://github.com/kanjitalk755/macemu.git
synced 2025-02-07 19:30:30 +00:00
Extra warning for ROM path not set,
try to terminate in QuitEmulator()
This commit is contained in:
parent
aaf7c9e10d
commit
b39a1d7729
@ -269,6 +269,8 @@ bool InitEmulator (void)
|
|||||||
|
|
||||||
// Get rom file path from preferences
|
// Get rom file path from preferences
|
||||||
const char *rom_path = PrefsFindString("rom");
|
const char *rom_path = PrefsFindString("rom");
|
||||||
|
if ( ! rom_path )
|
||||||
|
WarningAlert("No rom pathname set. Trying ./ROM");
|
||||||
|
|
||||||
// Load Mac ROM
|
// Load Mac ROM
|
||||||
int rom_fd = open(rom_path ? rom_path : ROM_FILE_NAME, O_RDONLY);
|
int rom_fd = open(rom_path ? rom_path : ROM_FILE_NAME, O_RDONLY);
|
||||||
@ -318,9 +320,6 @@ bool InitEmulator (void)
|
|||||||
|
|
||||||
void QuitEmuNoExit()
|
void QuitEmuNoExit()
|
||||||
{
|
{
|
||||||
// extern NSApplication *NSApp;
|
|
||||||
|
|
||||||
|
|
||||||
D(bug("QuitEmulator\n"));
|
D(bug("QuitEmulator\n"));
|
||||||
|
|
||||||
// Exit 680x0 emulation
|
// Exit 680x0 emulation
|
||||||
@ -361,14 +360,18 @@ void QuitEmuNoExit()
|
|||||||
|
|
||||||
// Exit preferences
|
// Exit preferences
|
||||||
PrefsExit();
|
PrefsExit();
|
||||||
|
|
||||||
// Stop run loop?
|
|
||||||
//[NSApp terminate: nil];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void QuitEmulator(void)
|
void QuitEmulator(void)
|
||||||
{
|
{
|
||||||
|
extern NSApplication *NSApp;
|
||||||
|
|
||||||
|
|
||||||
QuitEmuNoExit();
|
QuitEmuNoExit();
|
||||||
|
|
||||||
|
// Stop run loop?
|
||||||
|
[NSApp terminate: nil];
|
||||||
|
|
||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user