Merge pull request #24 from habecker/fix/21-server-needs-forcequit

Fix/21-server-needs-forcequit

Author: habecker

src/bindings/callbacks.h

@@ -21,9 +21,6 @@ PLUGIN_EXPORT bool PLUGIN_CALL OnGameModeInit() {
 	return PySAMP::callback("OnGameModeInit", NULL);
 }
 
-PLUGIN_EXPORT bool PLUGIN_CALL OnGameModeExit() {
-	return PySAMP::callback("OnGameModeExit", NULL);
-}
 
 PLUGIN_EXPORT bool PLUGIN_CALL OnPlayerConnect(int playerid) {
 	return PySAMP::callback("OnPlayerConnect", Py_BuildValue("(i)", playerid));

src/main.cpp

@@ -45,11 +45,6 @@ PLUGIN_EXPORT bool PLUGIN_CALL Load(void **ppData)
 
 PLUGIN_EXPORT void PLUGIN_CALL Unload()
 {
-	if(threadingInitialized)
-	{
-		PySAMP::callback("OnThreadingStopSignal", NULL);
-		threading.join();
-	}
 	sampgdk::Unload();
 }
 
@@ -58,3 +53,13 @@ PLUGIN_EXPORT void PLUGIN_CALL ProcessTick()
 	sampgdk::ProcessTick();
 	PySAMP::callback("OnProcessTick", NULL);
 }
+
+
+PLUGIN_EXPORT bool PLUGIN_CALL OnGameModeExit() {
+	if(threadingInitialized)
+	{
+		PySAMP::callback("OnThreadingStopSignal", NULL);
+		threading.join();
+	}
+	return PySAMP::callback("OnGameModeExit", NULL);
+}