From b5aaf4ca30357e5a08c968dc3fd019a6313b365f Mon Sep 17 00:00:00 2001 From: Aussiemon Date: Thu, 22 May 2025 16:03:52 -0600 Subject: [PATCH 1/2] Fix mPickpocketDetected flag being set after use --- apps/openmw/mwgui/pickpocketitemmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openmw/mwgui/pickpocketitemmodel.cpp b/apps/openmw/mwgui/pickpocketitemmodel.cpp index fa7bce449b..437a21fb23 100644 --- a/apps/openmw/mwgui/pickpocketitemmodel.cpp +++ b/apps/openmw/mwgui/pickpocketitemmodel.cpp @@ -129,8 +129,8 @@ namespace MWGui { MWBase::Environment::get().getMechanicsManager()->commitCrime( player, mActor, MWBase::MechanicsManager::OT_Pickpocket, ESM::RefId(), 0, true); - MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Container); mPickpocketDetected = true; + MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Container); return false; } else From 192cf1535b9743f7ff2a1f97cae9df1d10d24f4b Mon Sep 17 00:00:00 2001 From: Aussiemon Date: Thu, 22 May 2025 16:10:05 -0600 Subject: [PATCH 2/2] Fix second instance of mPickpocketDetected set after use --- apps/openmw/mwgui/pickpocketitemmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openmw/mwgui/pickpocketitemmodel.cpp b/apps/openmw/mwgui/pickpocketitemmodel.cpp index 437a21fb23..8756427589 100644 --- a/apps/openmw/mwgui/pickpocketitemmodel.cpp +++ b/apps/openmw/mwgui/pickpocketitemmodel.cpp @@ -101,8 +101,8 @@ namespace MWGui { MWBase::Environment::get().getMechanicsManager()->commitCrime( player, mActor, MWBase::MechanicsManager::OT_Pickpocket, ESM::RefId(), 0, true); - MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Container); mPickpocketDetected = true; + MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Container); } }