fix observers

include/Base_DAQ.h

@@ -13,7 +13,6 @@ namespace inaf::oasbo::DAQ_observers {
 class BaseDAQ_Observer;
 }
 
-
 namespace inaf::oasbo::DAQ {
 class BaseDAQ {
 public:
@@ -58,11 +57,13 @@ public:
 	void setChangeStateFlag(bool flag) {
 		this->changeStateFlag = flag;
 	}
-	void registerObserver(inaf::oasbo::DAQ_observers::BaseDAQ_Observer *observer) {
+	void registerObserver(
+			inaf::oasbo::DAQ_observers::BaseDAQ_Observer *observer) {
 		observers.push_back(observer);
 	}
 
-	void removeObserver(inaf::oasbo::DAQ_observers::BaseDAQ_Observer *observer) {
+	void removeObserver(
+			inaf::oasbo::DAQ_observers::BaseDAQ_Observer *observer) {
 		observers.erase(
 				std::remove(observers.begin(), observers.end(), observer),
 				observers.end());
@@ -104,6 +105,10 @@ public:
 		delete archiver;
 		delete monitor;
 		delete packet;
+		for (auto ob : observers) {
+			observers.erase(std::remove(observers.begin(), observers.end(), ob),
+					observers.end());
+		}
 	}
 };
 }

include/Base_DAQ_Observer.h

@@ -13,11 +13,11 @@ namespace inaf::oasbo::DAQ_observers{
 
 class BaseDAQ_Observer{
 protected:
-	inaf::oasbo::DAQ::BaseDAQ * dataAcquisition;
+	inaf::oasbo::DAQ::BaseDAQ *dataAcquisition;
 
 public:
-  BaseDAQ_Observer(inaf::oasbo::DAQ::BaseDAQ * dataAcquisition) {
-    this->dataAcquisition = dataAcquisition;
+  BaseDAQ_Observer(inaf::oasbo::DAQ::BaseDAQ &dataAcquisition) {
+    this->dataAcquisition = &dataAcquisition;
     this->dataAcquisition->registerObserver(this);
   }