From 5e50bb2b324cedf4ddb8c412e0436d8efc8f30e9 Mon Sep 17 00:00:00 2001
From: yuzubot <yuzu@yuzu-emu.org>
Date: Thu, 5 May 2022 02:10:41 +0000
Subject: [PATCH] "Merge Tagged PR 8306"

---
 src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp |  9 +++++----
 src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp | 10 ++++++----
 src/yuzu_cmd/yuzu.cpp                          |  3 ++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp
index 8075c9082..6ac9dcf54 100644
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp
@@ -90,8 +90,8 @@ EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsyste
     }
     SDL_GL_SetSwapInterval(0);
 
-    std::string window_title = fmt::format("yuzu {} | {}-{}", Common::g_build_fullname,
-                                           Common::g_scm_branch, Common::g_scm_desc);
+    std::string window_title = fmt::format("{} | {}-{}", Common::g_title_bar_format_idle,
+                                           Common::g_scm_branch, Common::g_scm_rev);
     render_window =
         SDL_CreateWindow(window_title.c_str(),
                          SDL_WINDOWPOS_UNDEFINED, // x position
@@ -136,8 +136,9 @@ EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsyste
     OnResize();
     OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size);
     SDL_PumpEvents();
-    LOG_INFO(Frontend, "yuzu Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
-             Common::g_scm_desc);
+
+    LOG_INFO(Frontend, "{} | {}-{}", Common::g_title_bar_format_idle, Common::g_scm_branch,
+             Common::g_scm_rev);
     Settings::LogSettings();
 }
 
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
index d5fe35aa0..911579078 100644
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
@@ -24,8 +24,10 @@
 EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsystem,
                                      Core::System& system_, bool fullscreen)
     : EmuWindow_SDL2{input_subsystem, system_} {
-    const std::string window_title = fmt::format("yuzu {} | {}-{} (Vulkan)", Common::g_build_name,
-                                                 Common::g_scm_branch, Common::g_scm_desc);
+    const std::string window_title =
+        fmt::format("{} | {}-{} (Vulkan)", Common::g_title_bar_format_idle, Common::g_scm_branch,
+                    Common::g_scm_rev);
+
     render_window =
         SDL_CreateWindow(window_title.c_str(), SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
                          Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height,
@@ -89,8 +91,8 @@ EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsyste
     OnResize();
     OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size);
     SDL_PumpEvents();
-    LOG_INFO(Frontend, "yuzu Version: {} | {}-{} (Vulkan)", Common::g_build_name,
-             Common::g_scm_branch, Common::g_scm_desc);
+    LOG_INFO(Frontend, "{} | {}-{} (Vulkan)", Common::g_title_bar_format_idle, Common::g_scm_branch,
+             Common::g_scm_rev);
 }
 
 EmuWindow_SDL2_VK::~EmuWindow_SDL2_VK() = default;
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index ab12dd15d..86b3ec7ff 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -67,7 +67,8 @@ static void PrintHelp(const char* argv0) {
 }
 
 static void PrintVersion() {
-    std::cout << "yuzu " << Common::g_scm_branch << " " << Common::g_scm_desc << std::endl;
+    std::cout << Common::g_title_bar_format_idle << " " << Common::g_scm_branch << "-"
+              << Common::g_scm_rev << std::endl;
 }
 
 /// Application entry point