Merge branch 'FixDoublePickpocketBounty' into 'master'

Prevent second bounty for "closed pickpocket window" when steal is already detected

Closes #8519

See merge request OpenMW/openmw!4694
This commit is contained in:
psi29a 2025-07-01 21:29:06 +00:00
commit 47aa0b27ff

View File

@ -101,8 +101,8 @@ namespace MWGui
{ {
MWBase::Environment::get().getMechanicsManager()->commitCrime( MWBase::Environment::get().getMechanicsManager()->commitCrime(
player, mActor, MWBase::MechanicsManager::OT_Pickpocket, ESM::RefId(), 0, true); player, mActor, MWBase::MechanicsManager::OT_Pickpocket, ESM::RefId(), 0, true);
MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Container);
mPickpocketDetected = true; mPickpocketDetected = true;
MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Container);
} }
} }
@ -129,8 +129,8 @@ namespace MWGui
{ {
MWBase::Environment::get().getMechanicsManager()->commitCrime( MWBase::Environment::get().getMechanicsManager()->commitCrime(
player, mActor, MWBase::MechanicsManager::OT_Pickpocket, ESM::RefId(), 0, true); player, mActor, MWBase::MechanicsManager::OT_Pickpocket, ESM::RefId(), 0, true);
MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Container);
mPickpocketDetected = true; mPickpocketDetected = true;
MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Container);
return false; return false;
} }
else else