diff options
| author | Rachel Bryk <RachelBryk@gmail.com> | 2014-06-20 21:22:54 -0400 |
|---|---|---|
| committer | Rachel Bryk <RachelBryk@gmail.com> | 2014-06-20 21:22:54 -0400 |
| commit | 3e609790006204b2fa279ee26dfffe2ae4d95bd6 (patch) | |
| tree | 1567ab072a59dd7f524971a989536199cf202e1d /Source/Core | |
| parent | 07da9cbcf460dd909ef9fae3bbed466f499c749b (diff) | |
Abort loading a save state if emulation isn't running.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/State.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp index 1398ef7bea..ccd56643da 100644 --- a/Source/Core/Core/State.cpp +++ b/Source/Core/Core/State.cpp @@ -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); |