From 74d67261a94361c919061a8f9d54cefe4dc5c0e2 Mon Sep 17 00:00:00 2001
From: Erik Frojdh <erik.frojdh@gmail.com>
Date: Tue, 14 May 2019 17:09:24 +0200
Subject: [PATCH] no check for null when deleting

---
 slsDetectorSoftware/src/slsDetectorCommand.cpp        | 2 +-
 slsReceiverSoftware/src/DataStreamer.cpp              | 2 +-
 slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/slsDetectorSoftware/src/slsDetectorCommand.cpp b/slsDetectorSoftware/src/slsDetectorCommand.cpp
index d43806288..4306b6d61 100755
--- a/slsDetectorSoftware/src/slsDetectorCommand.cpp
+++ b/slsDetectorSoftware/src/slsDetectorCommand.cpp
@@ -3439,7 +3439,7 @@ std::string slsDetectorCommand::cmdDetectorSize(int narg, char *args[], int acti
         ret = myDet->setDynamicRange(val, detPos);
     } else if (cmd == "roi") {
         const ROI* r = myDet->getROI(ret, detPos);
-        if (r != NULL)
+        
             delete [] r;
     } else if (cmd == "detsizechan") {
         sprintf(ans, "%d %d", myDet->getMaxNumberOfChannelsPerDetector(X), myDet->getMaxNumberOfChannelsPerDetector(Y));
diff --git a/slsReceiverSoftware/src/DataStreamer.cpp b/slsReceiverSoftware/src/DataStreamer.cpp
index d76285da9..de30be551 100755
--- a/slsReceiverSoftware/src/DataStreamer.cpp
+++ b/slsReceiverSoftware/src/DataStreamer.cpp
@@ -46,7 +46,7 @@ DataStreamer::DataStreamer(int ind, Fifo* f, uint32_t* dr, std::vector<ROI>* r,
 
 DataStreamer::~DataStreamer() {
 	CloseZmqSocket();
-	if (completeBuffer) delete [] completeBuffer;
+	delete [] completeBuffer;
 	ThreadObject::DestroyThread();
 }
 
diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
index 41a728425..216f151f3 100755
--- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
+++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
@@ -28,9 +28,9 @@ slsReceiverTCPIPInterface::~slsReceiverTCPIPInterface() {
 		delete mySock;
 		mySock=nullptr;
 	}
-	if (interface)
+	
 		delete interface;
-	if(receiver)
+	
 		delete receiver;
 }