summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-04-17 01:19:05 +0200
committerbunnei <bunneidev@gmail.com>2015-05-02 00:26:59 +0200
commitd5665fea89dc2684e145e82a1b07086f11a13a65 (patch)
treec9f5a2307705337ad9517cc9f913054596c5927a
parentQt: Move EmuThread ownership from render window to main window. (diff)
downloadyuzu-d5665fea89dc2684e145e82a1b07086f11a13a65.tar
yuzu-d5665fea89dc2684e145e82a1b07086f11a13a65.tar.gz
yuzu-d5665fea89dc2684e145e82a1b07086f11a13a65.tar.bz2
yuzu-d5665fea89dc2684e145e82a1b07086f11a13a65.tar.lz
yuzu-d5665fea89dc2684e145e82a1b07086f11a13a65.tar.xz
yuzu-d5665fea89dc2684e145e82a1b07086f11a13a65.tar.zst
yuzu-d5665fea89dc2684e145e82a1b07086f11a13a65.zip
-rw-r--r--src/citra_qt/bootmanager.cpp10
-rw-r--r--src/citra_qt/bootmanager.h9
-rw-r--r--src/citra_qt/main.cpp1
3 files changed, 2 insertions, 18 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 50c8fed1e..c2b7ba0e2 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -28,15 +28,9 @@
#define COPYRIGHT "Copyright (C) 2013-2014 Citra Team"
EmuThread::EmuThread(GRenderWindow* render_window) :
- filename(""), exec_cpu_step(false), cpu_running(false),
- stop_run(false), render_window(render_window)
-{
- connect(this, SIGNAL(started()), render_window, SLOT(moveContext()));
-}
+ exec_cpu_step(false), cpu_running(false), stop_run(false), render_window(render_window) {
-void EmuThread::SetFilename(std::string filename)
-{
- this->filename = filename;
+ connect(this, SIGNAL(started()), render_window, SLOT(moveContext()));
}
void EmuThread::run()
diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h
index d3eab6ec1..8083d275b 100644
--- a/src/citra_qt/bootmanager.h
+++ b/src/citra_qt/bootmanager.h
@@ -21,13 +21,6 @@ class EmuThread : public QThread
Q_OBJECT
public:
- /**
- * Set image filename
- *
- * @param filename
- * @warning Only call when not running!
- */
- void SetFilename(std::string filename);
/**
* Start emulation (on new thread)
@@ -72,8 +65,6 @@ private:
EmuThread(GRenderWindow* render_window);
- std::string filename;
-
bool exec_cpu_step;
bool cpu_running;
std::atomic<bool> stop_run;
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 0e57d9e18..9f9ebc918 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -211,7 +211,6 @@ void GMainWindow::BootGame(std::string filename)
registersWidget->OnDebugModeEntered();
callstackWidget->OnDebugModeEntered();
- emu_thread->SetFilename(filename);
emu_thread->start();
render_window->show();