Merge pull request #23 from Tinadim/cleaning-up-listeners-on-pie-session

Cleaning up listeners on PIE session

Author: getnamo

Source/GlobalEventSystem/GlobalEventSystem.Build.cs

@@ -50,5 +50,10 @@ public GlobalEventSystem(ReadOnlyTargetRules Target) : base(Target)
 				// ... add any modules that your module loads dynamically here ...
 			}
 			);
+		
+		if (Target.Type == TargetRules.TargetType.Editor)
+		{
+			PublicDependencyModuleNames.Add("UnrealEd");
+		} 
 	}
 }

Source/GlobalEventSystem/Private/GESHandler.cpp

@@ -4,6 +4,11 @@
 
 TSharedPtr<FGESHandler> FGESHandler::PrivateDefaultHandler = MakeShareable(new FGESHandler());
 
+void FGESHandler::Clear()
+{
+	PrivateDefaultHandler = MakeShareable(new FGESHandler());
+}
+
 bool FGESHandler::FirstParamIsCppType(UFunction* Function, const FString& TypeString)
 {
 	TArray<FProperty*> Properties;

Source/GlobalEventSystem/Private/GlobalEventSystem.cpp

@@ -2,19 +2,29 @@
 
 #include "GlobalEventSystem.h"
 
+#if WITH_EDITOR
+#include "Editor.h"
+#include "GESHandler.h"
+#endif
+
 #define LOCTEXT_NAMESPACE "FGlobalEventSystemModule"
 
 void FGlobalEventSystemModule::StartupModule()
 {
-	// This code will execute after your module is loaded into memory; the exact timing is specified in the .uplugin file per-module
-	
+#if WITH_EDITOR
+	EndPieDelegate = FEditorDelegates::BeginPIE.AddLambda([](bool boolSent)
+	{
+		UE_LOG(LogTemp, Warning, TEXT("Clearing FGESHandler"));
+		FGESHandler::Clear();		
+	});
+#endif
 }
 
 void FGlobalEventSystemModule::ShutdownModule()
 {
-	// This function may be called during shutdown to clean up your module.  For modules that support dynamic reloading,
-	// we call this function before unloading the module.
-	
+#if WITH_EDITOR
+	FEditorDelegates::EndPIE.Remove(EndPieDelegate);
+#endif
 }
 
 #undef LOCTEXT_NAMESPACE

Source/GlobalEventSystem/Public/GESHandler.h

@@ -25,6 +25,11 @@ class GLOBALEVENTSYSTEM_API FGESHandler
 	//Get the Global (default) handler to call all other functions
 	static TSharedPtr<FGESHandler> DefaultHandler();
 
+	/**
+	*   Clear all listeners and reset state
+	*/
+	static void Clear();
+
 	/**
 	*	Create an event in TargetDomain.TargetFunction. Does nothing if already existing.
 	*/

Source/GlobalEventSystem/Public/GlobalEventSystem.h

@@ -11,4 +11,10 @@ class FGlobalEventSystemModule : public IModuleInterface
 	/** IModuleInterface implementation */
 	virtual void StartupModule() override;
 	virtual void ShutdownModule() override;
+
+private:
+
+#if WITH_EDITOR
+	FDelegateHandle EndPieDelegate;
+#endif
 };