Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-07 07:06:46 +00:00
Code Issues Projects Releases Wiki Activity

Always remove cdrom & floppy prefs, as we always need to locate them freshly

Browse Source
This commit is contained in:
nigel 2004-05-02 11:09:25 +00:00
parent b0c4669f04
commit c44036a4ce
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
BasiliskII/src/MacOSX/prefs_macosx.cpp
View File

@ -1,7 +1,7 @@
/* /*
* $Id$ * $Id$
* *
* prefs_macosx.cpp - Preferences handling, Unix specific. * prefs_macosx.cpp - Preferences handling, Mac OS X specific.
* Based on prefs_unix.cpp * Based on prefs_unix.cpp
* *
* Basilisk II (C) 1997-2004 Christian Bauer * Basilisk II (C) 1997-2004 Christian Bauer
@ -77,20 +77,11 @@ void LoadPrefs(void)
SavePrefs(); SavePrefs();
} }
// Remove Nigel's bad old floppy and serial prefs // Remove Nigel's bad old serial prefs
const char *str; const char *str;
int tmp = 0; int tmp = 0;
while ( (str = PrefsFindString("floppy", tmp) ) != NULL )
if ( strncmp(str, "/dev/fd/", 8) == 0 )
{
printf("Deleting invalid prefs item 'floppy %s'\n", str);
PrefsRemoveItem("floppy", tmp);
}
else
++tmp;
if ( (str = PrefsFindString("seriala") ) != NULL if ( (str = PrefsFindString("seriala") ) != NULL
&& strcmp(str, "/dev/ttys0") == 0 ) && strcmp(str, "/dev/ttys0") == 0 )
{ {
@ -104,6 +95,15 @@ void LoadPrefs(void)
puts("Deleting invalid prefs item 'serialb /dev/ttys1'"); puts("Deleting invalid prefs item 'serialb /dev/ttys1'");
PrefsRemoveItem("serialb", 1); PrefsRemoveItem("serialb", 1);
} }
// Floppy & cdrom prefs are always removed -
// we search for them each time the emulator is started
while ( (str = PrefsFindString("floppy", tmp) ) != NULL )
PrefsRemoveItem("floppy", tmp);
while ( (str = PrefsFindString("cdrom", tmp) ) != NULL )
PrefsRemoveItem("cdrom", tmp);
} }