diff options
| author | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2014-07-10 21:02:47 +0200 |
|---|---|---|
| committer | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2014-07-10 21:02:47 +0200 |
| commit | bc655d1a8246cb3be69900446a050ffbafcee14f (patch) | |
| tree | 2a1a9f189b0fac4bac33d7c9d84e148717712904 /Source/Core/DolphinWX/ConfigMain.cpp | |
| parent | 15c1250d9d3f7aa7821a142582d63f38f782f15a (diff) | |
| parent | 4df00ae5441aefe8a13548152036f91dd3e4dda0 (diff) | |
Merge pull request #515 from Armada651/threading
Make the emulation stop asynchronous to prevent deadlocks.
Diffstat (limited to 'Source/Core/DolphinWX/ConfigMain.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/ConfigMain.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp index c74400a73f..9208b70b08 100644 --- a/Source/Core/DolphinWX/ConfigMain.cpp +++ b/Source/Core/DolphinWX/ConfigMain.cpp @@ -230,7 +230,7 @@ void CConfigMain::SetSelectedTab(int tab) // Used to restrict changing of some options while emulator is running void CConfigMain::UpdateGUI() { - if (Core::GetState() != Core::CORE_UNINITIALIZED) + if (Core::IsRunning()) { // Disable the Core stuff on GeneralPage CPUThread->Disable(); @@ -669,7 +669,7 @@ void CConfigMain::CreateGUIControls() Latency->Bind(wxEVT_SPINCTRL, &CConfigMain::AudioSettingsChanged, this); - if (Core::GetState() != Core::CORE_UNINITIALIZED) + if (Core::IsRunning()) { Latency->Disable(); BackendSelection->Disable(); @@ -888,7 +888,7 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event) { // Core - Basic case ID_CPUTHREAD: - if (Core::GetState() != Core::CORE_UNINITIALIZED) + if (Core::IsRunning()) return; SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread = CPUThread->IsChecked(); break; @@ -1099,7 +1099,7 @@ void CConfigMain::ChooseMemcardPath(std::string& strMemcard, bool isSlotA) { strMemcard = filename; - if (Core::GetState() != Core::CORE_UNINITIALIZED) + if (Core::IsRunning()) { // Change memcard to the new file ExpansionInterface::ChangeDevice( @@ -1136,7 +1136,7 @@ void CConfigMain::ChooseSIDevice(wxString deviceName, int deviceNum) SConfig::GetInstance().m_SIDevice[deviceNum] = tempType; - if (Core::GetState() != Core::CORE_UNINITIALIZED) + if (Core::IsRunning()) { // Change plugged device! :D SerialInterface::ChangeDevice(tempType, deviceNum); @@ -1172,7 +1172,7 @@ void CConfigMain::ChooseEXIDevice(wxString deviceName, int deviceNum) SConfig::GetInstance().m_EXIDevice[deviceNum] = tempType; - if (Core::GetState() != Core::CORE_UNINITIALIZED) + if (Core::IsRunning()) { // Change plugged device! :D ExpansionInterface::ChangeDevice( |