mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-30 11:06:43 +00:00
Code Issues Releases Wiki Activity

When dialogue goodbye is forced, allow using either the red link or the goodbye button

Browse source 
Fixes #1373
This commit is contained in:
scrawl 2014-06-01 00:21:14 +02:00
parent 7c9c0830a9
commit dcc0e2d105
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwgui/dialogue.cpp
View file

@ -271,7 +271,8 @@ namespace MWGui
void DialogueWindow::exit() void DialogueWindow::exit()
{ {
if (!mEnabled || MWBase::Environment::get().getDialogueManager()->isInChoice()) if ((!mEnabled || MWBase::Environment::get().getDialogueManager()->isInChoice())
&& !mGoodbye)
return; return;
MWBase::Environment::get().getDialogueManager()->goodbyeSelected(); MWBase::Environment::get().getDialogueManager()->goodbyeSelected();
} }
@ -517,7 +518,7 @@ namespace MWGui
MyGUI::Button* byeButton; MyGUI::Button* byeButton;
getWidget(byeButton, "ByeButton"); getWidget(byeButton, "ByeButton");
if(MWBase::Environment::get().getDialogueManager()->isInChoice()) { if(MWBase::Environment::get().getDialogueManager()->isInChoice() && !mGoodbye) {
byeButton->setEnabled(false); byeButton->setEnabled(false);
} }
else { else {