qtscript: Move initialization and shutdown to stage two to avoid memo…

…ry leakage.

Also make sure we clear out old labels.

src/init.cpp

@@ -855,11 +855,6 @@ bool stageOneInitialise(void)
 		return false;
 	}
 
-	if (!initScripts())		// Initialise the new javascript system
-	{
-		return false;
-	}
-
 	if (!gridInitialise())
 	{
 		return false;
@@ -932,11 +927,6 @@ bool stageOneShutDown(void)
 		return false;
 	}
 
-	if (!shutdownScripts())
-	{
-		return false;
-	}
-
 	debug(LOG_TEXTURE, "=== stageOneShutDown ===");
 	pie_TexShutDown();
 	// no map for the main menu
@@ -1003,6 +993,11 @@ bool stageTwoInitialise(void)
 		return false;
 	}
 
+	if (!initScripts())		// Initialise the new javascript system
+	{
+		return false;
+	}
+
 	// keymappings
 	keyClearMappings();
 	keyInitMappings(false);
@@ -1047,6 +1042,11 @@ bool stageTwoShutDown(void)
 	freeAllFeatures();
 	freeAllFlagPositions();
 
+	if (!shutdownScripts())
+	{
+		return false;
+	}
+
 	if (!messageShutdown())
 	{
 		return false;

src/qtscriptfuncs.cpp

@@ -2970,6 +2970,7 @@ bool unregisterFunctions(QScriptEngine *engine)
 	int num = groups.remove(engine);
 	delete psMap;
 	ASSERT(num == 1, "Number of engines removed from group map is %d!", num);
+	labels.clear();
 	return true;
 }
 
@@ -2993,7 +2994,10 @@ void prepareLabels()
 					int id = (*j);
 					BASE_OBJECT *psObj = IdToPointer(id, l.player);
 					ASSERT(psObj, "Unit %d belonging to player %d not found", id, l.player);
-					groupAddObject(psObj, l.id, engine);
+					if (psObj)
+					{
+						groupAddObject(psObj, l.id, engine);
+					}
 				}
 			}
 		}