mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-19 20:53:52 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'scrawl/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2013-01-02 10:03:59 +01:00
commit 0e80b445a9
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -539,9 +539,8 @@ void WindowManager::messageBox (const std::string& message, const std::vector<st
{
if(buttons.empty()){
/* If there are no buttons, and there is a dialogue window open, messagebox goes to the dialogue window */
if(std::find(mGuiModes.begin(), mGuiModes.end(), GM_Dialogue) != mGuiModes.end())
if(!mGuiModes.empty() && mGuiModes.back() == GM_Dialogue)
mDialogueWindow->addMessageBox(MyGUI::LanguageManager::getInstance().replaceTags(message));
else
mMessageBoxManager->createMessageBox(message);
}