diff options
| author | 2018-07-26 12:04:30 -0700 | |
|---|---|---|
| committer | 2018-07-26 12:04:30 -0700 | |
| commit | ec2b7cdb1d6cb9f42969b86e826fb1f85d43ce28 (patch) | |
| tree | 79d7910e4a60d7efe9665583db1ce574c694857a | |
| parent | Merge pull request #835 from FearlessTobi/port-minor-prs (diff) | |
| parent | Port #3665 from Citra (diff) | |
| download | yuzu-ec2b7cdb1d6cb9f42969b86e826fb1f85d43ce28.tar.gz yuzu-ec2b7cdb1d6cb9f42969b86e826fb1f85d43ce28.tar.xz yuzu-ec2b7cdb1d6cb9f42969b86e826fb1f85d43ce28.zip | |
Merge pull request #836 from FearlessTobi/port-3594
Port #3665 from Citra: "frontend: Log Citra version"
| -rw-r--r-- | src/yuzu/main.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 3c2726498..97273f967 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -101,6 +101,8 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) { | |||
| 101 | 101 | ||
| 102 | ConnectMenuEvents(); | 102 | ConnectMenuEvents(); |
| 103 | ConnectWidgetEvents(); | 103 | ConnectWidgetEvents(); |
| 104 | LOG_INFO(Frontend, "yuzu Version: {} | {}-{}", Common::g_build_name, Common::g_scm_branch, | ||
| 105 | Common::g_scm_desc); | ||
| 104 | 106 | ||
| 105 | setWindowTitle(QString("yuzu %1| %2-%3") | 107 | setWindowTitle(QString("yuzu %1| %2-%3") |
| 106 | .arg(Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc)); | 108 | .arg(Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc)); |
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index 72ba7d49c..e2945b6cf 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | |||
| @@ -164,6 +164,8 @@ EmuWindow_SDL2::EmuWindow_SDL2(bool fullscreen) { | |||
| 164 | OnResize(); | 164 | OnResize(); |
| 165 | OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size); | 165 | OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size); |
| 166 | SDL_PumpEvents(); | 166 | SDL_PumpEvents(); |
| 167 | LOG_INFO(Frontend, "yuzu Version: {} | {}-{}", Common::g_build_name, Common::g_scm_branch, | ||
| 168 | Common::g_scm_desc); | ||
| 167 | 169 | ||
| 168 | DoneCurrent(); | 170 | DoneCurrent(); |
| 169 | } | 171 | } |