Ticket #2426: fix-trac-2426.patch

source/network/tests/test_Net.h

@@ -40 +40 @@
         g_VFS = CreateVfs(20 * MiB);
         TS_ASSERT_OK(g_VFS->Mount(L"", DataDir()/"mods"/"public", VFS_MOUNT_MUST_EXIST));
         TS_ASSERT_OK(g_VFS->Mount(L"cache", DataDir()/"_testcache"));
+        g_ScriptRuntime = ScriptInterface::CreateRuntime(128*MiB);
         CXeromyces::Startup();
 
         // Need some stuff for terrain movement costs:
@@ -148 +149 @@
         CNetServer server;
 
         CScriptValRooted attrs;
-        scriptInterface.Eval("({mapType:'scenario',map:'_default',thing:'example'})", attrs);
+        scriptInterface.Eval("({mapType:'scenario',map:'maps/scenarios/Median Oasis 01',mapPath:'maps/scenarios/',thing:'example'})", attrs);
         server.UpdateGameAttributes(attrs.get(), scriptInterface);
 
         CNetClient client1(&client1Game);
@@ -210 +211 @@
         CNetServer server;
 
         CScriptValRooted attrs;
-        scriptInterface.Eval("({mapType:'scenario',map:'_default',thing:'example'})", attrs);
+        scriptInterface.Eval("({mapType:'scenario',map:'maps/scenarios/Median Oasis 01',mapPath:'maps/scenarios/',thing:'example'})", attrs);
         server.UpdateGameAttributes(attrs.get(), scriptInterface);
 
         CNetClient client1(&client1Game);

source/scriptinterface/ScriptInterface.cpp

@@ -478 +478 @@
     m_runtime(runtime)
 {
     JSBool ok;
+    
+    ENSURE(m_runtime);
 
     m_cx = JS_NewContext(m_runtime->m_rt, STACK_CHUNK_SIZE);
     ENSURE(m_cx);