Update dialogue topics list after result script is run

Regression from 0.42.
OpenMW · Nov 15, 2017 · 35d68f0 · 35d68f0
1 parent 93e9df1
commit 35d68f0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
@@ -45,6 +45,11 @@ namespace MWGui
             mWindow->addResponse(title, text, mNeedMargin);
         }
 
+        void updateTopics()
+        {
+            mWindow->updateTopics();
+        }
+
     private:
         DialogueWindow* mWindow;
         bool mNeedMargin;
@@ -91,6 +96,7 @@ namespace MWGui
             type = MWBase::MechanicsManager::PT_Bribe1000;
 
         MWBase::Environment::get().getDialogueManager()->persuade(type, mCallback.get());
+        mCallback->updateTopics();
 
         setVisible(false);
     }
@@ -395,6 +401,8 @@ namespace MWGui
                 else if (topic == gmst.find("sRepair")->getString())
                     MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_MerchantRepair, mPtr);
             }
+            else
+                updateTopics();
         }
     }
 
@@ -432,7 +440,9 @@ namespace MWGui
 
         setTitle(mPtr.getClass().getName(mPtr));
 
-        updateTopicsPane();
+        updateTopics();
+        updateTopicsPane(); // force update for new services
+
         updateDisposition();
         restock();
     }
@@ -620,11 +630,13 @@ namespace MWGui
     void DialogueWindow::onTopicActivated(const std::string &topicId)
     {
         MWBase::Environment::get().getDialogueManager()->keywordSelected(topicId, mCallback.get());
+        updateTopics();
     }
 
     void DialogueWindow::onChoiceActivated(int id)
     {
         MWBase::Environment::get().getDialogueManager()->questionAnswered(id, mCallback.get());
+        updateTopics();
     }
 
     void DialogueWindow::onGoodbyeActivated()

diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp
@@ -131,8 +131,9 @@ namespace MWGui
         void onFrame(float dt);
         void clear() { resetReference(); }
 
-    protected:
         void updateTopics();
+
+    protected:
         void updateTopicsPane();
         bool isCompanion(const MWWorld::Ptr& actor);
         bool isCompanion();