From 3e609790006204b2fa279ee26dfffe2ae4d95bd6 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Fri, 20 Jun 2014 21:22:54 -0400 Subject: [PATCH] Abort loading a save state if emulation isn't running. --- Source/Core/Core/State.cpp | 3 +++ 1 file changed, 3 insertions(+) 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& 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);