teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Check if item model exists inside drag and drop functions

Browse source
This commit is contained in:
Andrei Kortunov 2018-08-03 16:40:04 +04:00
parent e4f862c0b9
commit eeffe2e557
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwgui/container.cpp
View file

@ -52,7 +52,7 @@ namespace MWGui
void ContainerWindow::onItemSelected(int index) void ContainerWindow::onItemSelected(int index)
{ {
if (mDragAndDrop->mIsOnDragAndDrop && mModel) if (mDragAndDrop->mIsOnDragAndDrop)
{ {
dropItem(); dropItem();
return; return;
@ -82,12 +82,15 @@ namespace MWGui
dialog->eventOkClicked.clear(); dialog->eventOkClicked.clear();
dialog->eventOkClicked += MyGUI::newDelegate(this, &ContainerWindow::dragItem); dialog->eventOkClicked += MyGUI::newDelegate(this, &ContainerWindow::dragItem);
} }
else if (mModel) else
dragItem (NULL, count); dragItem (NULL, count);
} }
void ContainerWindow::dragItem(MyGUI::Widget* sender, int count) void ContainerWindow::dragItem(MyGUI::Widget* sender, int count)
{ {
if (!mModel)
return;
if (!onTakeItem(mModel->getItem(mSelectedItem), count)) if (!onTakeItem(mModel->getItem(mSelectedItem), count))
return; return;
@ -96,6 +99,9 @@ namespace MWGui
void ContainerWindow::dropItem() void ContainerWindow::dropItem()
{ {
if (!mModel)
return;
bool success = mModel->onDropItem(mDragAndDrop->mItem.mBase, mDragAndDrop->mDraggedCount); bool success = mModel->onDropItem(mDragAndDrop->mItem.mBase, mDragAndDrop->mDraggedCount);
if (success) if (success)
@ -104,7 +110,7 @@ namespace MWGui
void ContainerWindow::onBackgroundSelected() void ContainerWindow::onBackgroundSelected()
{ {
if (mDragAndDrop->mIsOnDragAndDrop && mModel) if (mDragAndDrop->mIsOnDragAndDrop)
dropItem(); dropItem();
} }