diff --git a/Common/System/Request.cpp b/Common/System/Request.cpp index 8111c09302..532c28d443 100644 --- a/Common/System/Request.cpp +++ b/Common/System/Request.cpp @@ -72,7 +72,7 @@ bool RequestManager::MakeSystemRequest(SystemRequestType type, RequesterToken to callbackMap_[requestId] = { callback, failedCallback, token }; } - INFO_LOG(Log::System, "Making system request %s: id %d", RequestTypeAsString(type), requestId); + DEBUG_LOG(Log::System, "Making system request %s: id %d", RequestTypeAsString(type), requestId); std::string p1(param1); std::string p2(param2); // TODO: Convert to string_view diff --git a/Core/Util/GameDB.cpp b/Core/Util/GameDB.cpp index 0eb634e1d2..4d42d175e4 100644 --- a/Core/Util/GameDB.cpp +++ b/Core/Util/GameDB.cpp @@ -59,6 +59,7 @@ static void SplitSV(std::string_view strv, char delim, bool removeWhiteSpace, st } } +// Call this with the mutex locked. void GameDB::LoadIfNeeded() { if (loaded_) { // Already loaded @@ -143,7 +144,7 @@ bool GameDB::GetGameInfos(std::string_view id, std::vector *infos) { LoadIfNeeded(); for (const auto &line : lines_) { - for (const auto serial : line.serials) { + for (const auto &serial : line.serials) { // Ignore version and stuff for now if (IDMatches(id, serial)) { GameDBInfo info; diff --git a/UI/DebugOverlay.cpp b/UI/DebugOverlay.cpp index 0ca818a930..354ced7e7b 100644 --- a/UI/DebugOverlay.cpp +++ b/UI/DebugOverlay.cpp @@ -304,7 +304,7 @@ void DrawCrashDump(UIContext *ctx, const Path &gamePath) { if (Reporting::HasCRC(gamePath)) { u32 crc = Reporting::RetrieveCRC(gamePath); std::vector dbInfos; - if (g_gameDB.GetGameInfos(discID, &dbInfos)) { + if (discID.size() >= 9 && g_gameDB.GetGameInfos(discID, &dbInfos)) { for (auto &dbInfo : dbInfos) { if (dbInfo.crc == crc) { isoOK = true; @@ -329,9 +329,9 @@ void DrawCrashDump(UIContext *ctx, const Path &gamePath) { // TODO: Draw a lot more information. Full register set, and so on. #ifdef _DEBUG - char build[] = "debug"; + const char * const build = "debug"; #else - char build[] = "release"; + const char * const build = "release"; #endif std::string sysName = System_GetProperty(SYSPROP_NAME);