diff --git a/BasiliskII/src/extfs.cpp b/BasiliskII/src/extfs.cpp
index e18d1df1..adc8d4a0 100644
--- a/BasiliskII/src/extfs.cpp
+++ b/BasiliskII/src/extfs.cpp
@@ -106,7 +106,7 @@ static uint32 fs_data = 0; // Mac address of global data
static char FS_NAME[32], VOLUME_NAME[32];
// This directory is our root (read from prefs)
-static const char *RootPath;
+static char RootPath[MAX_PATH_LENGTH];
static bool ready = false;
static struct stat root_stat;
@@ -196,7 +196,7 @@ static uint32 get_creation_time(const char *path)
{
if (path == NULL)
return 0;
- if (path == RootPath) {
+ if (!strcmp(path, RootPath)) {
static uint32 root_crtime = UINT_MAX;
if (root_crtime == UINT_MAX)
root_crtime = do_get_creation_time(path);
@@ -435,7 +435,11 @@ void ExtFSInit(void)
p->guest_name[31] = 0;
// Find path for root
- if ((RootPath = PrefsFindString("extfs")) != NULL) {
+ *RootPath = 0;
+ const char *path = PrefsFindString("extfs");
+ if (path != NULL) {
+ strncpy(RootPath, path, MAX_PATH_LENGTH - 1);
+ RootPath[MAX_PATH_LENGTH - 1] = 0;
if (stat(RootPath, &root_stat))
return;
if (!S_ISDIR(root_stat.st_mode))
diff --git a/SheepShaver/src/MacOSX/Launcher/English.lproj/VMSettingsWindow.nib/designable.nib b/SheepShaver/src/MacOSX/Launcher/English.lproj/VMSettingsWindow.nib/designable.nib
old mode 100755
new mode 100644
index d2ec997b..ec7ab08c
--- a/SheepShaver/src/MacOSX/Launcher/English.lproj/VMSettingsWindow.nib/designable.nib
+++ b/SheepShaver/src/MacOSX/Launcher/English.lproj/VMSettingsWindow.nib/designable.nib
@@ -1,4438 +1,766 @@
-
-
- 1050
- 10K549
- 851
- 1038.36
- 461.00
-
-
-
-
-
-
-
- 0
- IBCocoaFramework
-
-
-
- YES
- ../../SheepShaver.xcodeproj
- 3
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Any
+ CD-ROM
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 512
+ 640
+ 800
+ 1024
+ Maximum
+
+
+
+
+
+
+
+
+
+
+
+ 384
+ 480
+ 600
+ 768
+ Maximum
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SheepShaver/src/MacOSX/Launcher/English.lproj/VMSettingsWindow.nib/keyedobjects.nib b/SheepShaver/src/MacOSX/Launcher/English.lproj/VMSettingsWindow.nib/keyedobjects.nib
old mode 100755
new mode 100644
index b27171c4..3084f389
Binary files a/SheepShaver/src/MacOSX/Launcher/English.lproj/VMSettingsWindow.nib/keyedobjects.nib and b/SheepShaver/src/MacOSX/Launcher/English.lproj/VMSettingsWindow.nib/keyedobjects.nib differ
diff --git a/SheepShaver/src/MacOSX/Launcher/VMSettingsController.mm b/SheepShaver/src/MacOSX/Launcher/VMSettingsController.mm
index 5ceee33f..7575152d 100755
--- a/SheepShaver/src/MacOSX/Launcher/VMSettingsController.mm
+++ b/SheepShaver/src/MacOSX/Launcher/VMSettingsController.mm
@@ -30,6 +30,8 @@
#include
+#include "SDL.h"
+
// NSInteger was added in 10.5 SDK.
#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050
#if __LP64__ || NS_BUILD_32_LIKE_64
@@ -478,6 +480,10 @@ static NSString *makeRelativeIfNecessary(NSString *path)
[[self window] close];
[NSApp stopModal];
cancelWasClicked = NO;
+
+ // quit
+ SDL_Event event = { .type = SDL_QUIT };
+ SDL_PushEvent(&event);
}
- (BOOL) cancelWasClicked