sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Frontend: Support loading state while powered off

Browse Source
This commit is contained in:
Connor McLaughlin
2019-10-21 00:38:04 +10:00
parent 1b8b730f85
commit 6c73dc6efb
3 changed files with 58 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/duckstation/main.cpp
View File

@ -30,15 +30,6 @@ static int Run(int argc, char* argv[])
return -1;
}
// create display and host interface
std::unique_ptr<SDLInterface> host_interface = SDLInterface::Create();
if (!host_interface)
{
Panic("Failed to create host interface");
SDL_Quit();
return -1;
}
// parameters
const char* filename = nullptr;
const char* exp1_filename = nullptr;
@ -59,21 +50,14 @@ static int Run(int argc, char* argv[])
#undef CHECK_ARG_PARAM
}
// create system
const bool boot = (filename != nullptr || exp1_filename != nullptr || !state_filename.IsEmpty());
if (boot)
// create display and host interface
std::unique_ptr<SDLInterface> host_interface =
SDLInterface::Create(filename, exp1_filename, state_filename.IsEmpty() ? nullptr : state_filename.GetCharArray());
if (!host_interface)
{
if (!host_interface->InitializeSystem(filename, exp1_filename))
{
host_interface.reset();
SDL_Quit();
return -1;
}
host_interface->ConnectDevices();
if (!state_filename.IsEmpty())
host_interface->LoadState(state_filename);
Panic("Failed to create host interface");
SDL_Quit();
return -1;
}
// run