mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-20 12:41:36 +00:00
Code Issues Releases Wiki Activity

fix QuickKeysMenu crash on reopening window after item drop + pickup [see: !11#note_85086570]

Browse source
This commit is contained in:
Finbar Crago 2018-06-29 23:32:05 +10:00
parent 7ae388086b
commit 2722ca50fb
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwgui/quickkeysmenu.cpp
View file

@ -99,15 +99,16 @@ namespace MWGui
{ {
MWWorld::Ptr item = *mKey[i].button->getUserData<MWWorld::Ptr>(); MWWorld::Ptr item = *mKey[i].button->getUserData<MWWorld::Ptr>();
// Make sure the item is available and is not broken // Make sure the item is available and is not broken
if (item.getRefData().getCount() < 1 || if (!item || item.getRefData().getCount() < 1 ||
(item.getClass().hasItemHealth(item) && (item.getClass().hasItemHealth(item) &&
item.getClass().getItemHealth(item) <= 0)) item.getClass().getItemHealth(item) <= 0))
{ {
// Try searching for a compatible replacement // Try searching for a compatible replacement
std::string id = item.getCellRef().getRefId(); item = store.findReplacement(mKey[i].id);
item = store.findReplacement(id); if (item)
mKey[i].button->setUserData(MWWorld::Ptr(item)); mKey[i].button->setUserData(MWWorld::Ptr(item));
break; break;
} }
} }