Merge pull request #523 from RachelBryk/uninitialized-load-state

Abort loading a save state if emulation isn't running.
This commit is contained in:
Tony Wasserka 2014-06-21 11:39:57 +02:00
commit ddadb4f29d

View File

@ -424,6 +424,9 @@ void LoadFileStateData(const std::string& filename, std::vector<u8>& ret_data)
void LoadAs(const std::string& filename)
{
if (Core::GetState() == Core::CORE_UNINITIALIZED)
return;
// Stop the core while we load the state
bool wasUnpaused = Core::PauseAndLock(true);