- Fixes for destructors

Author: LK-Simon

src/ESPressio_IObservable.hpp

@@ -1,8 +1,5 @@
 #pragma once
 
-#include <functional>
-#include <memory>
-
 #include "ESPressio_IObserver.hpp"
 
 namespace ESPressio {
@@ -14,6 +11,7 @@ namespace ESPressio {
         /// It is used to not only check if the `IObservable` still exists, but also to unregister the Observer when desired!
         class IObserverHandle {
             public:
+                virtual ~IObserverHandle() = default;
                 /// Will Unregister this Observer from the `IObservable` if it still exists
                 virtual void Unregister() = 0;
                 /// Will return a `weak_ptr` to the `IObservable`
@@ -22,8 +20,9 @@ namespace ESPressio {
                 virtual IObserver* GetObserver() = 0;
         };
 
-        class IObservable : public std::enable_shared_from_this<IObservable> {
+        class IObservable {
             public:
+                virtual ~IObservable() = default;
                 /// Will Register the`IObserver` with this `IObservable`
                 virtual IObserverHandle* RegisterObserver(IObserver* observer) = 0;
                 /// Will Unregister the `IObserver` from this `IObservable`

src/ESPressio_Observable.hpp

@@ -44,12 +44,13 @@ namespace ESPressio {
                     }
                     IObserverHandle* handle = new ObserverHandle(this, observer);
                     _observers.push_back(handle);
+                    return handle;
                 }
 
                 virtual void UnregisterObserver(IObserver* observer) {
                     for (auto thisObserver = _observers.begin(); thisObserver != _observers.end(); thisObserver++) {
                         if ((*thisObserver)->GetObserver() == observer) {
-                            (*thisObserver)->Unregister();
+                            static_cast<ObserverHandle*>((*thisObserver))->__invalidate();
                             _observers.erase(thisObserver);
                             return;
                         }

src/ESPressio_ObserverHandle.hpp

@@ -14,24 +14,25 @@ namespace ESPressio {
             public:
                 ObserverHandle(IObservable* observable, IObserver* observer) : _observable(observable), _observer(observer) {}
 
-                ~ObserverHandle() {
+                ~ObserverHandle() override {
                     Unregister();
                 }
 
-                virtual void __invalidate() {
+                void __invalidate() {
                     _observable = nullptr;
                 }
 
-                virtual void Unregister() {
+                void Unregister() override {
                     if (_observable == nullptr) { return; }
                     _observable->UnregisterObserver(_observer);
+                    __invalidate();
                 }
 
-                virtual IObservable* GetObservable() {
+                IObservable* GetObservable() override {
                     return _observable;
                 }
 
-                virtual IObserver* GetObserver() {
+                IObserver* GetObserver() override {
                     return _observer;
                 }
         };