Skip to content

Commit

Permalink
Core: Don't return true on IsRunning() when stopping emulation.
Browse files Browse the repository at this point in the history
  • Loading branch information
CrossVR committed Jul 25, 2015
1 parent 59eb7a8 commit 0092f52
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Source/Core/Core/Core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ void DisplayMessage(const std::string& message, int time_in_ms)

bool IsRunning()
{
return (GetState() != CORE_UNINITIALIZED) || s_hardware_initialized;
return (GetState() != CORE_UNINITIALIZED || s_hardware_initialized) && !s_is_stopping;
}

bool IsRunningAndStarted()
Expand Down

0 comments on commit 0092f52

Please sign in to comment.