Merge branches 'actorcomponent' and 'master' of http://github.com/duc…

…andu/marlene
ducandu · Jan 31, 2018 · 8d1c97c · 8d1c97c
2 parents a5edddc + c45eda6
commit 8d1c97c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Plugins/MaRLEnE/Source/MaRLEnE/Private/MLObserver.cpp b/Plugins/MaRLEnE/Source/MaRLEnE/Private/MLObserver.cpp
@@ -261,9 +261,14 @@ void UMLObserver::OnComponentDestroyed(bool bDestroyingHierarchy)
 	if (BillboardComponent)
 		BillboardComponent->DestroyComponent();
 
+
+
+}
+
+UMLObserver::~UMLObserver()
+{
 	// unregister from the manager
 	MLObserversManager::UnregisterObserver(this);
-
 }
 
 TArray<UMLObserver *> UMLObserver::GetRegisteredObservers()

diff --git a/Plugins/MaRLEnE/Source/MaRLEnE/Public/MLObserver.h b/Plugins/MaRLEnE/Source/MaRLEnE/Public/MLObserver.h
@@ -84,6 +84,7 @@ class MARLENE_API UMLObserver : public UActorComponent
 public:
 	// Sets default values for this component's properties
 	UMLObserver();
+	~UMLObserver();
 	void OnRegister() override;
 	void OnComponentDestroyed(bool bDestroyingHierarchy) override;