Merge pull request #2772 from Capostrophic/startscript

Make adding non-existent global script more forgiving (bug #5364)
OpenMW · Apr 13, 2020 · f75417e · f75417e
2 parents a769270 + 844b601
commit f75417e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 0.47.0
 ------
 
+    Bug #5364: Script fails/stops if trying to startscript an unknown script
     Bug #5367: Selecting a spell on an enchanted item per hotkey always plays the equip sound
     Bug #5369: Spawnpoint in the Grazelands doesn't produce oversized creatures
     Feature #5362: Show the soul gems' trapped soul in count dialog

diff --git a/apps/openmw/mwscript/globalscripts.cpp b/apps/openmw/mwscript/globalscripts.cpp
@@ -28,7 +28,7 @@ namespace MWScript
 
         if (iter==mScripts.end())
         {
-            if (const ESM::Script *script = mStore.get<ESM::Script>().find (name))
+            if (const ESM::Script *script = mStore.get<ESM::Script>().search(name))
             {
                 GlobalScriptDesc desc;
                 desc.mRunning = true;
@@ -37,6 +37,10 @@ namespace MWScript
 
                 mScripts.insert (std::make_pair (name, desc));
             }
+            else
+            {
+                Log(Debug::Error) << "Failed to add global script " << name << ": script record not found";
+            }
         }
         else if (!iter->second.mRunning)
         {