sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qt: Regression fixes

Browse Source
This commit is contained in:
Connor McLaughlin
2022-07-22 22:51:29 +10:00
parent 7e52c01b35
commit 701780e2ef
6 changed files with 46 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/system.cpp
View File

@ -3910,7 +3910,8 @@ bool System::LoadCheatList(const char* filename)
bool System::LoadCheatListFromGameTitle()
{
if (!IsValid() || Achievements::ChallengeModeActive())
// Called when booting, needs to test for shutdown.
if (IsShutdown() || Achievements::ChallengeModeActive())
return false;
const std::string filename(GetCheatFileName());
@ -3922,15 +3923,15 @@ bool System::LoadCheatListFromGameTitle()
bool System::LoadCheatListFromDatabase()
{
if (System::GetRunningCode().empty() || Achievements::ChallengeModeActive())
if (IsShutdown() || s_running_game_code.empty() || Achievements::ChallengeModeActive())
return false;
std::unique_ptr<CheatList> cl = std::make_unique<CheatList>();
if (!cl->LoadFromPackage(System::GetRunningCode()))
if (!cl->LoadFromPackage(s_running_game_code))
return false;
Log_InfoPrintf("Loaded %u cheats from database.", cl->GetCodeCount());
System::SetCheatList(std::move(cl));
SetCheatList(std::move(cl));
return true;
}