mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-30 19:24:23 +01:00
Allow --mount in the app, so --vsh can boot with a disc inserted
--mount ISO used to be headless-only, and EmuScreen always cleared CoreParameter::mountIso. Pass it from the command line into the first EmuScreen, which keeps it across resets and drops it when another game is booted. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
b225c33639
commit
3a5c5a51c5
8 files changed
+16
-10
No files matched your search
+3
-1
@@ -411,6 +411,7 @@ std::thread *graphicsLoadThread;
|
||||
|
||||
// globals
|
||||
Path boot_filename;
|
||||
Path boot_mountIso;
|
||||
|
||||
// This is called before NativeInit so we do a little bit of initialization here.
|
||||
void NativeGetAppInfo(std::string *app_dir_name, std::string *app_nice_name, bool *landscape, std::string *version) {
|
||||
@@ -701,6 +702,7 @@ void NativeInit(int argc, const char *argv[], const CommandLineOptions &cmdLineO
|
||||
if (boot_filename.empty() && cmdLineOptions.bootVSH.value_or(false)) {
|
||||
boot_filename = g_Config.nandRootDirectory / "flash0/vsh/module/vshmain.prx";
|
||||
}
|
||||
boot_mountIso = cmdLineOptions.mountIso.has_value() ? Path(cmdLineOptions.mountIso.value()) : Path();
|
||||
|
||||
if (cmdLineOptions.appendConfig.has_value()) {
|
||||
g_Config.SetAppendedConfigIni(Path(cmdLineOptions.appendConfig.value()));
|
||||
@@ -833,7 +835,7 @@ void NativeInit(int argc, const char *argv[], const CommandLineOptions &cmdLineO
|
||||
}
|
||||
} else if (skipLogo && !boot_filename.empty()) {
|
||||
INFO_LOG(Log::System, "Launching EmuScreen with boot filename '%s'", boot_filename.c_str());
|
||||
g_screenManager->switchScreen(new EmuScreen(boot_filename));
|
||||
g_screenManager->switchScreen(new EmuScreen(boot_filename, boot_mountIso));
|
||||
} else {
|
||||
g_screenManager->switchScreen(new LogoScreen(AfterLogoScreen::DEFAULT));
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user