Merge PR #3657: Remove unneeded null pointer checks

mumble-voip · Sep 25, 2019 · 61c838a · 61c838a
2 parents 737fec3 + 615c72b
commit 61c838a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/src/mumble/JackAudio.cpp b/src/mumble/JackAudio.cpp
@@ -96,10 +96,8 @@ class JackAudioInit : public DeferInit {
 		}
 
 		void destroy() {
-			if (airJackAudio)
-				delete airJackAudio;
-			if (aorJackAudio)
-				delete aorJackAudio;
+			delete airJackAudio;
+			delete aorJackAudio;
 			if (jasys) {
 				delete jasys;
 				jasys = NULL;

diff --git a/src/murmur/MurmurGRPCImpl.cpp b/src/murmur/MurmurGRPCImpl.cpp
@@ -128,9 +128,7 @@ void GRPCStart() {
 }
 
 void GRPCStop() {
-	if (service) {
-		delete service;
-	}
+	delete service;
 }
 
 MurmurRPCImpl::MurmurRPCImpl(const QString &address, std::shared_ptr<::grpc::ServerCredentials> credentials) {

diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp
@@ -637,11 +637,9 @@ void Server::initBonjour() {
 }
 
 void Server::removeBonjour() {
-	if (bsRegistration) {
-		delete bsRegistration;
-		bsRegistration = NULL;
-		log("Stopped announcing server via bonjour");
-	}
+	delete bsRegistration;
+	bsRegistration = NULL;
+	log("Stopped announcing server via bonjour");
 }
 #endif