diff --git a/Common/UI/Root.cpp b/Common/UI/Root.cpp index 18de799d4e..f55a25c7ed 100644 --- a/Common/UI/Root.cpp +++ b/Common/UI/Root.cpp @@ -128,8 +128,6 @@ void EnableFocusMovement(bool enable) { focusMoves.clear(); heldKeys.clear(); focusedView = nullptr; - } else { - enable = enable; } } diff --git a/Core/Util/RecentFiles.cpp b/Core/Util/RecentFiles.cpp index 5a8d422d6a..eb06d673e6 100644 --- a/Core/Util/RecentFiles.cpp +++ b/Core/Util/RecentFiles.cpp @@ -131,7 +131,7 @@ void RecentFilesManager::Add(std::string_view filename) { } // Some things should not be added to recent, such as the VSH (which will have a separate UI for launching it) - if (endsWithNoCase(filename, "vshmain.prx")) { + if (equalsNoCase(Path(filename).GetFilename(), "vshmain.prx")) { return; } diff --git a/UI/ImDebugger/ImDebugger.cpp b/UI/ImDebugger/ImDebugger.cpp index 1cf62862a0..9a2827f3f1 100644 --- a/UI/ImDebugger/ImDebugger.cpp +++ b/UI/ImDebugger/ImDebugger.cpp @@ -2471,7 +2471,7 @@ void ImDebugger::Frame(MIPSDebugInterface *mipsDebug, GPUCommon *gpuDebug, Draw: if (ImGui::BeginMainMenuBar()) { if (ImGui::BeginMenu("File")) { if (ImGui::MenuItem("Load")) { - System_BrowseForFile(reqToken_, "Load", BrowseFileType::SAVE_STATE, [this](std::string_view responseString, int) { + System_BrowseForFile(reqToken_, "Load", BrowseFileType::SAVE_STATE, [](std::string_view responseString, int) { Path path(responseString); System_PostUIMessage(UIMessage::REQUEST_GAME_BOOT, path.ToString()); }); @@ -2506,12 +2506,12 @@ void ImDebugger::Frame(MIPSDebugInterface *mipsDebug, GPUCommon *gpuDebug, Draw: } ImGui::Separator(); if (ImGui::MenuItem("Load state from file...")) { - System_BrowseForFile(reqToken_, "Load", BrowseFileType::SAVE_STATE, [this](std::string_view fn, int) { + System_BrowseForFile(reqToken_, "Load", BrowseFileType::SAVE_STATE, [](std::string_view fn, int) { SaveState::Load(Path(fn), -1, ShowMessageAfterSaveStateAction); }); } if (ImGui::MenuItem("Save state to file...")) { - System_BrowseForFile(reqToken_, "Save", BrowseFileType::SAVE_STATE, [this](std::string_view fn, int) { + System_BrowseForFile(reqToken_, "Save", BrowseFileType::SAVE_STATE, [](std::string_view fn, int) { SaveState::Save(Path(fn), -1, ShowMessageAfterSaveStateAction); }); } diff --git a/UI/ImDebugger/ImJitViewer.h b/UI/ImDebugger/ImJitViewer.h index d756e1a40d..49c2ad4052 100644 --- a/UI/ImDebugger/ImJitViewer.h +++ b/UI/ImDebugger/ImJitViewer.h @@ -33,7 +33,6 @@ private: int curBlockNum_ = -1; int lastCpuStepCount_ = -1; - int blockSortColumn_ = 0; bool refresh_ = false; int core_ = -1;