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

GTK3: Fix --nogui option

Browse Source
This commit is contained in:
robxnano 2024-08-26 23:31:25 +01:00
parent 94b687a626
commit 208c2645da
No known key found for this signature in database
GPG Key ID: 9FB6B03B782D1E42
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
BasiliskII/src/Unix/main_unix.cpp
View File

@ -430,7 +430,7 @@ static void gui_startup (void)
#ifdef ENABLE_GTK_3_22
color_scheme_set(APP_PREFERS_LIGHT);
#endif
if (!PrefsEditor())
if (use_gui && !PrefsEditor())
QuitEmulator();
}
@ -514,22 +514,27 @@ int main(int argc, char **argv)
printf("switch address not defined\n");
usage(argv[0]);
}
// We intercept the --nogui commandline so that the settings
// window can change the setting from the prefs file
vde_sock = argv[i];
argv[i] = NULL;
} else if (strcmp(argv[i], "--nogui") == 0) {
// We intercept the --nogui commandline so that the settings
// window can change the setting from the prefs file
argv[i++] = NULL;
if (i < argc) {
if (strcmp(argv[i], "true") == 0)
if (strcmp(argv[i], "true") == 0) {
use_gui = false;
else
argv[i] = NULL;
}
else if (strcmp(argv[i], "false") == 0) {
use_gui = true;
argv[i] = NULL;
argv[i] = NULL;
}
} else {
use_gui = false;
}
// Alternative commands to enter the GUI
} else if (strcmp(argv[i], "--gui") == 0 || strcmp(argv[i], "--settings") == 0) {
use_gui = true;
argv[i] = NULL;
vde_sock = argv[i];
// Alternative commands to enter the GUI
use_gui = true;
argv[i] = NULL;
}

21
SheepShaver/src/Unix/main_unix.cpp
View File

@ -862,21 +862,26 @@ int main(int argc, char **argv)
UserPrefsPath = argv[i];
argv[i] = NULL;
}
// We intercept the --nogui commandline so that the settings
// window can change the setting from the prefs file
} else if (strcmp(argv[i], "--nogui") == 0) {
// We intercept the --nogui commandline so that the settings
// window can change the setting from the prefs file
argv[i++] = NULL;
if (i < argc) {
if (strcmp(argv[i], "true") == 0)
if (strcmp(argv[i], "true") == 0) {
use_gui = false;
else
argv[i] = NULL;
}
else if (strcmp(argv[i], "false") == 0) {
use_gui = true;
argv[i] = NULL;
argv[i] = NULL;
}
} else {
use_gui = false;
}
// Alternative commands to enter the GUI
} else if (strcmp(argv[i], "--gui") == 0 || strcmp(argv[i], "--settings") == 0) {
use_gui = true;
argv[i] = NULL;
// Alternative commands to enter the GUI
use_gui = true;
argv[i] = NULL;
} else if (valid_vmdir(argv[i])) {
vmdir = argv[i];
argv[i] = NULL;