summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVamsi Krishna <c.vamsi.krishna.96@gmail.com>2016-12-18 18:02:09 +0100
committerCaptV0rt3x <c.vamsi.krishna.96@gmail.com>2016-12-18 20:19:57 +0100
commit77f474319956b62b9cad772c9d030650d1debd47 (patch)
treebf656f566b3944d619b56e048d56d1624dd91499
parentFixed GPLv2 license text in the start. (diff)
downloadyuzu-77f474319956b62b9cad772c9d030650d1debd47.tar
yuzu-77f474319956b62b9cad772c9d030650d1debd47.tar.gz
yuzu-77f474319956b62b9cad772c9d030650d1debd47.tar.bz2
yuzu-77f474319956b62b9cad772c9d030650d1debd47.tar.lz
yuzu-77f474319956b62b9cad772c9d030650d1debd47.tar.xz
yuzu-77f474319956b62b9cad772c9d030650d1debd47.tar.zst
yuzu-77f474319956b62b9cad772c9d030650d1debd47.zip
-rw-r--r--src/citra_qt/bootmanager.cpp4
-rw-r--r--src/citra_qt/main.cpp2
2 files changed, 1 insertions, 5 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 7699ca8d0..030432bfb 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -19,10 +19,6 @@
#include "video_core/debug_utils/debug_utils.h"
#include "video_core/video_core.h"
-#define APP_NAME "citra"
-#define APP_VERSION "0.1-" VERSION
-#define APP_TITLE APP_NAME " " APP_VERSION
-#define COPYRIGHT "Copyright (C) 2013-2014 Citra Team"
EmuThread::EmuThread(GRenderWindow* render_window)
: exec_step(false), running(false), stop_run(false), render_window(render_window) {}
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index ad6221739..3e3c92f24 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -212,7 +212,7 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
SLOT(OnMenuLoadFile()));
connect(GetHotkey("Main Window", "Start Emulation", this), SIGNAL(activated()), this,
SLOT(OnStartGame()));
- connect(GetHotkey("Main Window", "Swap Screens", this), SIGNAL(activated()), this,
+ connect(GetHotkey("Main Window", "Swap Screens", render_window), SIGNAL(activated()), this,
SLOT(OnSwapScreens()));
std::string window_title =