diff options
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 10 | ||||
| -rw-r--r-- | src/citra_qt/bootmanager.h | 9 | ||||
| -rw-r--r-- | src/citra_qt/main.cpp | 1 |
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 @@ | |||
| 28 | #define COPYRIGHT "Copyright (C) 2013-2014 Citra Team" | 28 | #define COPYRIGHT "Copyright (C) 2013-2014 Citra Team" |
| 29 | 29 | ||
| 30 | EmuThread::EmuThread(GRenderWindow* render_window) : | 30 | EmuThread::EmuThread(GRenderWindow* render_window) : |
| 31 | filename(""), exec_cpu_step(false), cpu_running(false), | 31 | exec_cpu_step(false), cpu_running(false), stop_run(false), render_window(render_window) { |
| 32 | stop_run(false), render_window(render_window) | ||
| 33 | { | ||
| 34 | connect(this, SIGNAL(started()), render_window, SLOT(moveContext())); | ||
| 35 | } | ||
| 36 | 32 | ||
| 37 | void EmuThread::SetFilename(std::string filename) | 33 | connect(this, SIGNAL(started()), render_window, SLOT(moveContext())); |
| 38 | { | ||
| 39 | this->filename = filename; | ||
| 40 | } | 34 | } |
| 41 | 35 | ||
| 42 | void EmuThread::run() | 36 | 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 | |||
| 21 | Q_OBJECT | 21 | Q_OBJECT |
| 22 | 22 | ||
| 23 | public: | 23 | public: |
| 24 | /** | ||
| 25 | * Set image filename | ||
| 26 | * | ||
| 27 | * @param filename | ||
| 28 | * @warning Only call when not running! | ||
| 29 | */ | ||
| 30 | void SetFilename(std::string filename); | ||
| 31 | 24 | ||
| 32 | /** | 25 | /** |
| 33 | * Start emulation (on new thread) | 26 | * Start emulation (on new thread) |
| @@ -72,8 +65,6 @@ private: | |||
| 72 | 65 | ||
| 73 | EmuThread(GRenderWindow* render_window); | 66 | EmuThread(GRenderWindow* render_window); |
| 74 | 67 | ||
| 75 | std::string filename; | ||
| 76 | |||
| 77 | bool exec_cpu_step; | 68 | bool exec_cpu_step; |
| 78 | bool cpu_running; | 69 | bool cpu_running; |
| 79 | std::atomic<bool> stop_run; | 70 | 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) | |||
| 211 | registersWidget->OnDebugModeEntered(); | 211 | registersWidget->OnDebugModeEntered(); |
| 212 | callstackWidget->OnDebugModeEntered(); | 212 | callstackWidget->OnDebugModeEntered(); |
| 213 | 213 | ||
| 214 | emu_thread->SetFilename(filename); | ||
| 215 | emu_thread->start(); | 214 | emu_thread->start(); |
| 216 | 215 | ||
| 217 | render_window->show(); | 216 | render_window->show(); |