RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 18:53:28 +01:00
Code Issues Releases Wiki Activity

Fix Boot regression introduced by #4158

Browse Source
This commit is contained in:
Megamouse 2018-02-28 18:47:54 +01:00 committed by Ivan
parent f786c078c2
commit 3043c73745
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rpcs3/rpcs3qt/main_window.cpp
View File

@ -227,10 +227,11 @@ void main_window::SetAppIconFromPath(const std::string& path)
m_appIcon = QApplication::windowIcon(); 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); SetAppIconFromPath(path);
Emu.SetForceBoot(force_boot); Emu.SetForceBoot(true);
Emu.Stop();
if (Emu.BootGame(path, add_only)) 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 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); m_gameListFrame->Refresh(true);

2
rpcs3/rpcs3qt/main_window.h
View File

@ -85,7 +85,7 @@ public Q_SLOTS:
void RepaintGui(); void RepaintGui();
private Q_SLOTS: 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 BootElf();
void BootGame(); void BootGame();
void DecryptSPRXLibraries(); void DecryptSPRXLibraries();