summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Vamsi Krishna2016-12-18 22:32:09 +0530
committerGravatar CaptV0rt3x2016-12-19 00:49:57 +0530
commit77f474319956b62b9cad772c9d030650d1debd47 (patch)
treebf656f566b3944d619b56e048d56d1624dd91499 /src
parentFixed GPLv2 license text in the start. (diff)
downloadyuzu-77f474319956b62b9cad772c9d030650d1debd47.tar.gz
yuzu-77f474319956b62b9cad772c9d030650d1debd47.tar.xz
yuzu-77f474319956b62b9cad772c9d030650d1debd47.zip
screen swap - Hotkey mapping
Diffstat (limited to 'src')
-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 @@
19#include "video_core/debug_utils/debug_utils.h" 19#include "video_core/debug_utils/debug_utils.h"
20#include "video_core/video_core.h" 20#include "video_core/video_core.h"
21 21
22#define APP_NAME "citra"
23#define APP_VERSION "0.1-" VERSION
24#define APP_TITLE APP_NAME " " APP_VERSION
25#define COPYRIGHT "Copyright (C) 2013-2014 Citra Team"
26 22
27EmuThread::EmuThread(GRenderWindow* render_window) 23EmuThread::EmuThread(GRenderWindow* render_window)
28 : exec_step(false), running(false), stop_run(false), render_window(render_window) {} 24 : 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) {
212 SLOT(OnMenuLoadFile())); 212 SLOT(OnMenuLoadFile()));
213 connect(GetHotkey("Main Window", "Start Emulation", this), SIGNAL(activated()), this, 213 connect(GetHotkey("Main Window", "Start Emulation", this), SIGNAL(activated()), this,
214 SLOT(OnStartGame())); 214 SLOT(OnStartGame()));
215 connect(GetHotkey("Main Window", "Swap Screens", this), SIGNAL(activated()), this, 215 connect(GetHotkey("Main Window", "Swap Screens", render_window), SIGNAL(activated()), this,
216 SLOT(OnSwapScreens())); 216 SLOT(OnSwapScreens()));
217 217
218 std::string window_title = 218 std::string window_title =