summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorskidau <skidau@gmail.com>2010-12-09 12:04:03 +0000
committerskidau <skidau@gmail.com>2010-12-09 12:04:03 +0000
commitc718d2e630224d817fcf2f91ebf5ad9e91591773 (patch)
tree906d12bf6c6d6e947ee7e978559f96c1953ee985 /Source
parentf353f80302f0383eb2689c44504cf6eba2f9ff73 (diff)
Fixed an issue where the emulator would remain paused when attempting to load a non-existent save-state.
Fixes issue 3665. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6543 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/Src/State.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp
index 7ca429dd3a..fd07beb36c 100644
--- a/Source/Core/Core/Src/State.cpp
+++ b/Source/Core/Core/Src/State.cpp
@@ -295,6 +295,8 @@ void LoadStateCallback(u64 userdata, int cyclesLate)
if (!f)
{
Core::DisplayMessage("State not found", 2000);
+ // Resume the clock
+ PowerPC::Start();
return;
}
@@ -312,6 +314,8 @@ void LoadStateCallback(u64 userdata, int cyclesLate)
gameID), 2000);
fclose(f);
+ // Resume the clock
+ PowerPC::Start();
return;
}
@@ -326,6 +330,8 @@ void LoadStateCallback(u64 userdata, int cyclesLate)
if (!buffer)
{
PanicAlert("Error allocating buffer");
+ // Resume the clock
+ PowerPC::Start();
return;
}
while (true)
@@ -345,6 +351,8 @@ void LoadStateCallback(u64 userdata, int cyclesLate)
"Try loading the state again", res, i, new_len);
fclose(f);
delete[] buffer;
+ // Resume the clock
+ PowerPC::Start();
return;
}