diff options
| author | Jules Blok <jules.blok@gmail.com> | 2015-06-29 11:04:17 +0200 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2015-06-29 11:04:17 +0200 |
| commit | c06342c3cf6b6695a4a2ec9e759ef1dd2cb66015 (patch) | |
| tree | b0e446a69b4ed049bcfe064ac12737e9735ecc51 /Source | |
| parent | 1120132d261f08fae7bb19933a4d814d52eca8a3 (diff) | |
| parent | 9a244f07fa270c15c907564ee72a4530845c6ea8 (diff) | |
Merge branch 'stable'
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp b/Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp index d559e9dacd..d73c11a7c3 100644 --- a/Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp +++ b/Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp @@ -17,6 +17,7 @@ #include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Core/ActionReplay.h" +#include "Core/Core.h" #include "Core/HW/Memmap.h" #include "DolphinWX/WxUtils.h" #include "DolphinWX/Cheats/CheatSearchTab.h" @@ -125,7 +126,7 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent) void CheatSearchTab::StartNewSearch(wxCommandEvent& WXUNUSED(event)) { const u8* const memptr = Memory::m_pRAM; - if (memptr == nullptr) + if (!Core::IsRunningAndStarted()) { WxUtils::ShowErrorDialog(_("A game is not currently running.")); return; @@ -157,7 +158,7 @@ void CheatSearchTab::StartNewSearch(wxCommandEvent& WXUNUSED(event)) void CheatSearchTab::FilterCheatSearchResults(wxCommandEvent&) { const u8* const memptr = Memory::m_pRAM; - if (memptr == nullptr) + if (!Core::IsRunningAndStarted()) { WxUtils::ShowErrorDialog(_("A game is not currently running.")); return; |