From a3c4000198b1b970d52275ff8cdb67515158fc6a Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 25 Jul 2014 09:36:02 +0200
Subject: [PATCH] moved call to Globalscripts::addStartup out of the
 constructor because at the time of construction the environment may not be
 set up yet to perform this operation

---
 apps/openmw/engine.cpp                 | 2 ++
 apps/openmw/mwscript/globalscripts.cpp | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 66eae5f5d..6a48789a5 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -421,6 +421,8 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     mOgre->getRoot()->addFrameListener (this);
 
     // scripts
+    mEnvironment.getScriptManager()->getGlobalScripts().addStartup();
+
     if (mCompileAll)
     {
         std::pair<int, int> result = MWBase::Environment::get().getScriptManager()->compileAll();
diff --git a/apps/openmw/mwscript/globalscripts.cpp b/apps/openmw/mwscript/globalscripts.cpp
index 0c94f503b..8270c4e6b 100644
--- a/apps/openmw/mwscript/globalscripts.cpp
+++ b/apps/openmw/mwscript/globalscripts.cpp
@@ -20,9 +20,7 @@ namespace MWScript
 
     GlobalScripts::GlobalScripts (const MWWorld::ESMStore& store)
     : mStore (store)
-    {
-        addStartup();
-    }
+    {}
 
     void GlobalScripts::addScript (const std::string& name, const std::string& targetId)
     {