mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 19:19:56 +00:00
Code Issues Releases Wiki Activity

Merged merge request livestreamer https://www.twitch.tv/vanguardlx best

Browse source
This commit is contained in:
Marc Zinnschlag 2018-07-01 15:25:38 +02:00
commit aa5ddd6b28
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -124,7 +124,7 @@ namespace MWGui
while (key->button->getChildCount()) // Destroy number label while (key->button->getChildCount()) // Destroy number label
MyGUI::Gui::getInstance().destroyWidget(key->button->getChildAt(0)); MyGUI::Gui::getInstance().destroyWidget(key->button->getChildAt(0));
if (key->index == 9) if (key->index == 10)
{ {
key->type = Type_HandToHand; key->type = Type_HandToHand;
@ -163,6 +163,10 @@ namespace MWGui
assert(index != -1); assert(index != -1);
mSelected = &mKey[index]; mSelected = &mKey[index];
// prevent reallocation of zero key from Type_HandToHand
if(mSelected->index == 10)
return;
// open assign dialog // open assign dialog
if (!mAssignDialog) if (!mAssignDialog)
mAssignDialog = new QuickKeysMenuAssign(this); mAssignDialog = new QuickKeysMenuAssign(this);
@ -304,7 +308,7 @@ namespace MWGui
void QuickKeysMenu::activateQuickKey(int index) void QuickKeysMenu::activateQuickKey(int index)
{ {
assert(index >= 1 && index <= 9); assert(index >= 1 && index <= 10);
keyData *key = &mKey[index-1]; keyData *key = &mKey[index-1];