ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GUI-wx: Fix condition is always true/false warnings. 

Codacy.
This commit is contained in:
lightningterror 2022-09-17 14:24:55 +02:00
parent de5f310011
commit 18288544a5
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcsx2/gui/AppCoreThread.cpp
View File

@ -43,7 +43,6 @@ alignas(16) SysMtgsThread mtgsThread;
alignas(16) AppCoreThread CoreThread; alignas(16) AppCoreThread CoreThread;
static std::vector<u8> s_widescreen_cheats_data; static std::vector<u8> s_widescreen_cheats_data;
static bool s_widescreen_cheats_loaded = false;
typedef void (AppCoreThread::*FnPtr_CoreThreadMethod)(); typedef void (AppCoreThread::*FnPtr_CoreThreadMethod)();
@ -290,15 +289,14 @@ const IConsoleWriter* PatchesCon = &Console;
static void SetupPatchesCon(bool verbose) static void SetupPatchesCon(bool verbose)
{ {
bool devel = false;
#ifdef PCSX2_DEVBUILD #ifdef PCSX2_DEVBUILD
devel = true; PatchesCon = &Console;
#endif #else
if (verbose || DevConWriterEnabled)
if (verbose || DevConWriterEnabled || devel)
PatchesCon = &Console; PatchesCon = &Console;
else else
PatchesCon = &ConsoleWriter_Null; PatchesCon = &ConsoleWriter_Null;
#endif
} }
// fixup = src + command line overrides + game overrides (according to elfCRC). // fixup = src + command line overrides + game overrides (according to elfCRC).
@ -438,12 +436,9 @@ static void _ApplySettings(const Pcsx2Config& src, Pcsx2Config& fixup)
else else
{ {
// No ws cheat files found at the cheats_ws folder, try the ws cheats zip file. // No ws cheat files found at the cheats_ws folder, try the ws cheats zip file.
if (!s_widescreen_cheats_loaded)
{
std::optional<std::vector<u8>> data = Host::ReadResourceFile("cheats_ws.zip"); std::optional<std::vector<u8>> data = Host::ReadResourceFile("cheats_ws.zip");
if (data.has_value()) if (data.has_value())
s_widescreen_cheats_data = std::move(data.value()); s_widescreen_cheats_data = std::move(data.value());
}
if (!s_widescreen_cheats_data.empty()) if (!s_widescreen_cheats_data.empty())
{ {