diff --git a/Common/Data/Format/IniFile.cpp b/Common/Data/Format/IniFile.cpp index 4982a2c819..a32d92edc2 100644 --- a/Common/Data/Format/IniFile.cpp +++ b/Common/Data/Format/IniFile.cpp @@ -308,7 +308,7 @@ void Section::Set(std::string_view key, const std::vector& newValue temp += value + ","; } // remove last , - if (temp.length()) + if (!temp.empty()) temp.resize(temp.length() - 1); Set(key, temp.c_str()); } diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 6ac569b5fc..e4bc67d6a0 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -672,6 +672,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch } if (forceLogLevel) { + NOTICE_LOG(Log::System, "Setting log level to %d due to command line override", (int)logLevel); g_logManager.SetAllLogLevels(logLevel); } diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index a381cb2be2..09931f3865 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -1621,7 +1621,6 @@ extern "C" void JNICALL Java_org_ppsspp_ppsspp_NativeActivity_requestExitVulkanR _assert_(g_renderLoopThread.joinable()); exitRenderLoop = true; g_renderLoopThread.join(); - _assert_(!g_renderLoopThread.joinable()); g_renderLoopThread = std::thread(); }