From 3043c73745ec3f44b24ba69e686f1de78c04fbc2 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 28 Feb 2018 18:47:54 +0100 Subject: [PATCH] Fix Boot regression introduced by #4158 --- rpcs3/rpcs3qt/main_window.cpp | 7 ++++--- rpcs3/rpcs3qt/main_window.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 768e628cb0..ed25e28a7d 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -227,10 +227,11 @@ void main_window::SetAppIconFromPath(const std::string& path) m_appIcon = QApplication::windowIcon(); } -void main_window::Boot(const std::string& path, bool direct, bool add_only, bool force_boot) +void main_window::Boot(const std::string& path, bool direct, bool add_only) { SetAppIconFromPath(path); - Emu.SetForceBoot(force_boot); + Emu.SetForceBoot(true); + Emu.Stop(); if (Emu.BootGame(path, add_only)) { @@ -240,7 +241,7 @@ void main_window::Boot(const std::string& path, bool direct, bool add_only, bool } else { - LOG_ERROR(GENERAL, "Boot failed: path=%s direct=%d add_only=%d force_boot=%d", path, direct, add_only, force_boot); + LOG_ERROR(GENERAL, "Boot failed: path=%s direct=%d add_only=%d", path, direct, add_only); } m_gameListFrame->Refresh(true); diff --git a/rpcs3/rpcs3qt/main_window.h b/rpcs3/rpcs3qt/main_window.h index 168f0f44fd..ffe16dc9c1 100644 --- a/rpcs3/rpcs3qt/main_window.h +++ b/rpcs3/rpcs3qt/main_window.h @@ -85,7 +85,7 @@ public Q_SLOTS: void RepaintGui(); private Q_SLOTS: - void Boot(const std::string& path, bool direct = false, bool add_only = false, bool force_boot = true); + void Boot(const std::string& path, bool direct = false, bool add_only = false); void BootElf(); void BootGame(); void DecryptSPRXLibraries();