diff options
| author |  bunnei | 2016-12-18 16:07:26 -0500 |
|---|---|---|
| committer |  GitHub | 2016-12-18 16:07:26 -0500 |
| commit | 4d22e1530858e00bfd8efffb72cf94ed7125f925 (patch) | |
| tree | 19ff68a5d1e8578b2d9ce56cee354148cbd84c26 /src/citra_qt/main.cpp | |
| parent | Merge pull request #2345 from wwylele/no-zombie-thread (diff) | |
| parent | line fixup for travis ci (diff) | |
| download | yuzu-4d22e1530858e00bfd8efffb72cf94ed7125f925.tar.gz yuzu-4d22e1530858e00bfd8efffb72cf94ed7125f925.tar.xz yuzu-4d22e1530858e00bfd8efffb72cf94ed7125f925.zip | |
Merge pull request #2353 from CaptV0rt3x/code-cleanup
Code cleanup
Diffstat (limited to 'src/citra_qt/main.cpp')
| -rw-r--r-- | src/citra_qt/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 = |