summaryrefslogtreecommitdiff
path: root/src/citra_qt/bootmanager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/citra_qt/bootmanager.cpp')
-rw-r--r--src/citra_qt/bootmanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 758f71fda..9bf079919 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -23,7 +23,7 @@
23#define APP_TITLE APP_NAME " " APP_VERSION 23#define APP_TITLE APP_NAME " " APP_VERSION
24#define COPYRIGHT "Copyright (C) 2013-2014 Citra Team" 24#define COPYRIGHT "Copyright (C) 2013-2014 Citra Team"
25 25
26EmuThread::EmuThread(GRenderWindow* render_window) : 26EmuThread::EmuThread(GRenderWindow* render_window) :
27 filename(""), exec_cpu_step(false), cpu_running(false), 27 filename(""), exec_cpu_step(false), cpu_running(false),
28 stop_run(false), render_window(render_window) 28 stop_run(false), render_window(render_window)
29{ 29{
@@ -42,7 +42,7 @@ void EmuThread::run()
42 if (cpu_running) 42 if (cpu_running)
43 { 43 {
44 Core::RunLoop(); 44 Core::RunLoop();
45 } 45 }
46 else if (exec_cpu_step) 46 else if (exec_cpu_step)
47 { 47 {
48 exec_cpu_step = false; 48 exec_cpu_step = false;
@@ -274,5 +274,5 @@ void GRenderWindow::OnClientAreaResized(unsigned width, unsigned height)
274} 274}
275 275
276void GRenderWindow::OnMinimalClientAreaChangeRequest(const std::pair<unsigned,unsigned>& minimal_size) { 276void GRenderWindow::OnMinimalClientAreaChangeRequest(const std::pair<unsigned,unsigned>& minimal_size) {
277 setMinimumSize(minimal_size.first, minimal_size.second); 277 setMinimumSize(minimal_size.first, minimal_size.second);
278} 278}