aboutsummaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorStapleButter <thetotalworm@gmail.com>2017-06-04 15:55:23 +0200
committerStapleButter <thetotalworm@gmail.com>2017-06-04 15:55:23 +0200
commitfa2db3826ec417dda00be845fe7980dddb569214 (patch)
tree8be9c2f97af29ff57231065e7fc0874041d38efe /src/wx
parent568b9fbf49beda49b43b52f6af12d821835b766f (diff)
(finally) make the threaded 3D renderer option actually work
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/main.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/wx/main.cpp b/src/wx/main.cpp
index 1b245e8..a79861f 100644
--- a/src/wx/main.cpp
+++ b/src/wx/main.cpp
@@ -22,6 +22,7 @@
#include "../Config.h"
#include "../NDS.h"
#include "../GPU.h"
+#include "../GPU3D.h"
#include "../SPU.h"
#include "InputConfig.h"
@@ -283,8 +284,16 @@ void MainFrame::OnReset(wxCommandEvent& event)
void MainFrame::OnEmuConfig(wxCommandEvent& event)
{
+ bool oldpause = emuthread->EmuIsPaused();
+ if (!oldpause) emuthread->EmuPause();
+
EmuConfigDialog dlg(this);
dlg.ShowModal();
+
+ // apply threaded 3D setting
+ GPU3D::SoftRenderer::SetupRenderThread();
+
+ if (!oldpause) emuthread->EmuRun();
}
void MainFrame::OnInputConfig(wxCommandEvent& event)