1 files changed, 22 insertions, 11 deletions

diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index bbd1feb85..9ca1626d1 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -91,9 +91,20 @@ void GMainWindow::ShowCallouts() {}
 
 const int GMainWindow::max_recent_files_item;
 
+static void InitializeLogging() {
+    Log::Filter log_filter;
+    log_filter.ParseFilterString(Settings::values.log_filter);
+    Log::SetGlobalFilter(log_filter);
+
+    const std::string& log_dir = FileUtil::GetUserPath(FileUtil::UserPath::LogDir);
+    FileUtil::CreateFullPath(log_dir);
+    Log::AddBackend(std::make_unique<Log::FileBackend>(log_dir + LOG_FILE));
+}
+
 GMainWindow::GMainWindow()
     : config(new Config()), emu_thread(nullptr),
       vfs(std::make_shared<FileSys::RealVfsFilesystem>()) {
+    InitializeLogging();
 
     debug_context = Tegra::DebugContext::Construct();
 
@@ -544,6 +555,15 @@ void GMainWindow::BootGame(const QString& filename) {
     }
     status_bar_update_timer.start(2000);
 
+    std::string title_name;
+    const auto res = Core::System::GetInstance().GetGameName(title_name);
+    if (res != Loader::ResultStatus::Success)
+        title_name = FileUtil::GetFilename(filename.toStdString());
+
+    setWindowTitle(QString("yuzu %1| %4 | %2-%3")
+                       .arg(Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc,
+                            QString::fromStdString(title_name)));
+
     render_window->show();
     render_window->setFocus();
 
@@ -575,6 +595,8 @@ void GMainWindow::ShutdownGame() {
     render_window->hide();
     game_list->show();
     game_list->setFilterFocus();
+    setWindowTitle(QString("yuzu %1| %2-%3")
+                       .arg(Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc));
 
     // Disable status bar updates
     status_bar_update_timer.stop();
@@ -1172,16 +1194,6 @@ void GMainWindow::UpdateUITheme() {
 #undef main
 #endif
 
-static void InitializeLogging() {
-    Log::Filter log_filter;
-    log_filter.ParseFilterString(Settings::values.log_filter);
-    Log::SetGlobalFilter(log_filter);
-
-    const std::string& log_dir = FileUtil::GetUserPath(FileUtil::UserPath::LogDir);
-    FileUtil::CreateFullPath(log_dir);
-    Log::AddBackend(std::make_unique<Log::FileBackend>(log_dir + LOG_FILE));
-}
-
 int main(int argc, char* argv[]) {
     MicroProfileOnThreadCreate("Frontend");
     SCOPE_EXIT({ MicroProfileShutdown(); });
@@ -1199,7 +1211,6 @@ int main(int argc, char* argv[]) {
 
     GMainWindow main_window;
     // After settings have been loaded by GMainWindow, apply the filter
-    InitializeLogging();
     main_window.show();
     return app.exec();
 }