diff options
| author |  bunnei | 2015-07-29 16:46:34 -0400 |
|---|---|---|
| committer | bunnei | 2015-07-29 16:46:34 -0400 |
| commit | 9221e6e67a3d700ac4da5060afc70bc0809c2058 (patch) | |
| tree | f4f05e3253e1979b14113eea953fcce248efe7ce /src/citra_qt/bootmanager.cpp | |
| parent | Merge pull request #963 from yuriks/gpu-fixes (diff) | |
| parent | citra-qt: Adjust initializer list order (diff) | |
| download | yuzu-9221e6e67a3d700ac4da5060afc70bc0809c2058.tar.gz yuzu-9221e6e67a3d700ac4da5060afc70bc0809c2058.tar.xz yuzu-9221e6e67a3d700ac4da5060afc70bc0809c2058.zip | |
Merge pull request #1011 from lioncash/initializer
citra-qt: Adjust initializer list order
Diffstat (limited to 'src/citra_qt/bootmanager.cpp')
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index b12bd858b..a96fbea5f 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp | |||
| @@ -94,7 +94,7 @@ private: | |||
| 94 | }; | 94 | }; |
| 95 | 95 | ||
| 96 | GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread) : | 96 | GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread) : |
| 97 | QWidget(parent), emu_thread(emu_thread), keyboard_id(0) { | 97 | QWidget(parent), keyboard_id(0), emu_thread(emu_thread) { |
| 98 | 98 | ||
| 99 | std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc); | 99 | std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc); |
| 100 | setWindowTitle(QString::fromStdString(window_title)); | 100 | setWindowTitle(QString::fromStdString(window_title)); |