diff options
| author | bunnei <bunneidev@gmail.com> | 2016-12-18 22:07:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-18 22:07:26 +0100 |
| commit | 4d22e1530858e00bfd8efffb72cf94ed7125f925 (patch) | |
| tree | 19ff68a5d1e8578b2d9ce56cee354148cbd84c26 | |
| parent | Merge pull request #2345 from wwylele/no-zombie-thread (diff) | |
| parent | line fixup for travis ci (diff) | |
| download | yuzu-4d22e1530858e00bfd8efffb72cf94ed7125f925.tar yuzu-4d22e1530858e00bfd8efffb72cf94ed7125f925.tar.gz yuzu-4d22e1530858e00bfd8efffb72cf94ed7125f925.tar.bz2 yuzu-4d22e1530858e00bfd8efffb72cf94ed7125f925.tar.lz yuzu-4d22e1530858e00bfd8efffb72cf94ed7125f925.tar.xz yuzu-4d22e1530858e00bfd8efffb72cf94ed7125f925.tar.zst yuzu-4d22e1530858e00bfd8efffb72cf94ed7125f925.zip | |
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 5 | ||||
| -rw-r--r-- | src/citra_qt/main.cpp | 2 | ||||
| -rw-r--r-- | src/common/scm_rev.cpp.in | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 7699ca8d0..c7eb2aafc 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -19,11 +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 = diff --git a/src/common/scm_rev.cpp.in b/src/common/scm_rev.cpp.in index 09366e801..79b404bb8 100644 --- a/src/common/scm_rev.cpp.in +++ b/src/common/scm_rev.cpp.in @@ -1,5 +1,5 @@ // Copyright 2014 Citra Emulator Project -// Licensed under GPLv2 +// Licensed under GPLv2 or any later version // Refer to the license.txt file included. #include "common/scm_rev.h" |