From f017f9df58ebf50e1204cda6c5cb4b366d48e941 Mon Sep 17 00:00:00 2001 From: kanjitalk755 Date: Thu, 2 Jun 2022 20:36:31 +0900 Subject: [PATCH] fix pref item "cdrom" --- BasiliskII/src/SDL/prefs_sdl.cpp | 4 +++- BasiliskII/src/Unix/prefs_unix.cpp | 4 +++- BasiliskII/src/prefs_items.cpp | 3 --- SheepShaver/src/Unix/prefs_unix.cpp | 4 +++- SheepShaver/src/prefs_items.cpp | 3 --- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/BasiliskII/src/SDL/prefs_sdl.cpp b/BasiliskII/src/SDL/prefs_sdl.cpp index 5151f760..8afdbb18 100644 --- a/BasiliskII/src/SDL/prefs_sdl.cpp +++ b/BasiliskII/src/SDL/prefs_sdl.cpp @@ -67,7 +67,9 @@ void LoadPrefs(const char * vmdir) // TODO: load prefs from 'vmdir' fclose(f); } else { - +#ifdef __linux__ + PrefsAddString("cdrom", "/dev/cdrom"); +#endif // No prefs file, save defaults SavePrefs(); } diff --git a/BasiliskII/src/Unix/prefs_unix.cpp b/BasiliskII/src/Unix/prefs_unix.cpp index 4ca5fa28..4f2aa7ee 100644 --- a/BasiliskII/src/Unix/prefs_unix.cpp +++ b/BasiliskII/src/Unix/prefs_unix.cpp @@ -84,7 +84,9 @@ void LoadPrefs(const char *vmdir) fclose(f); } else { - +#ifdef __linux__ + PrefsAddString("cdrom", "/dev/cdrom"); +#endif // No prefs file, save defaults SavePrefs(); } diff --git a/BasiliskII/src/prefs_items.cpp b/BasiliskII/src/prefs_items.cpp index c41d1152..3d749292 100644 --- a/BasiliskII/src/prefs_items.cpp +++ b/BasiliskII/src/prefs_items.cpp @@ -132,7 +132,4 @@ void AddPrefsDefaults(void) PrefsAddBool("swap_opt_cmd", true); #endif PrefsAddBool("ignoresegv", true); -#ifdef __linux__ - PrefsAddString("cdrom", "/dev/cdrom"); -#endif } diff --git a/SheepShaver/src/Unix/prefs_unix.cpp b/SheepShaver/src/Unix/prefs_unix.cpp index 9ad9cb2a..7ac92cbd 100644 --- a/SheepShaver/src/Unix/prefs_unix.cpp +++ b/SheepShaver/src/Unix/prefs_unix.cpp @@ -91,7 +91,9 @@ void LoadPrefs(const char *vmdir) fclose(f); } else { - +#ifdef __linux__ + PrefsAddString("cdrom", "/dev/cdrom"); +#endif // No prefs file, save defaults SavePrefs(); } diff --git a/SheepShaver/src/prefs_items.cpp b/SheepShaver/src/prefs_items.cpp index e8e2fdd2..0169357b 100644 --- a/SheepShaver/src/prefs_items.cpp +++ b/SheepShaver/src/prefs_items.cpp @@ -113,7 +113,4 @@ void AddPrefsDefaults(void) #else PrefsAddBool("swap_opt_cmd", true); #endif -#ifdef __linux__ - PrefsAddString("cdrom", "/dev/cdrom"); -#endif }