ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Abort loading a save state if emulation isn't running.

This commit is contained in:
Rachel Bryk 2014-06-20 21:22:54 -04:00
parent 07da9cbcf4
commit 3e60979000
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/State.cpp
View File

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