From 5c7707fc3450712f2465ad0d59d54066869387bb Mon Sep 17 00:00:00 2001
From: Michael Lotz <mmlr@mlotz.ch>
Date: Sun, 5 Apr 2015 21:25:09 +0200
Subject: [PATCH] desklink: Use early return, no functional change.

---
 src/bin/desklink/VolumeControl.cpp | 39 +++++++++++++++---------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/bin/desklink/VolumeControl.cpp b/src/bin/desklink/VolumeControl.cpp
index db2e1a41da..bcb8f7520a 100644
--- a/src/bin/desklink/VolumeControl.cpp
+++ b/src/bin/desklink/VolumeControl.cpp
@@ -302,31 +302,32 @@ VolumeControl::MessageReceived(BMessage* msg)
 
 			bool isMediaServer = !strcmp(signature, kMediaServerSignature);
 			bool isAddOnServer = !strcmp(signature, kAddOnServerSignature);
+			if (!isMediaServer && !isAddOnServer)
+				break;
+
 			if (isMediaServer)
 				fMediaServerRunning = msg->what == B_SOME_APP_LAUNCHED;
 			if (isAddOnServer)
 				fAddOnServerRunning = msg->what == B_SOME_APP_LAUNCHED;
 
-			if (isMediaServer || isAddOnServer) {
-				if (!fMediaServerRunning && !fAddOnServerRunning) {
-					// No media server around
-					SetLabel(B_TRANSLATE("No media server running"));
-					SetEnabled(false);
-				} else if (fMediaServerRunning && fAddOnServerRunning) {
-					// HACK!
-					// quit our now invalid instance of the media roster
-					// so that before new nodes are created,
-					// we get a new roster
-					BMediaRoster* roster = BMediaRoster::CurrentRoster();
-					if (roster != NULL) {
-						roster->Lock();
-						roster->Quit();
-					}
-
-					BMessage reconnect(kMsgReconnectVolume);
-					BMessageRunner::StartSending(this, &reconnect, 1000000LL, 1);
-					fConnectRetries = 3;
+			if (!fMediaServerRunning && !fAddOnServerRunning) {
+				// No media server around
+				SetLabel(B_TRANSLATE("No media server running"));
+				SetEnabled(false);
+			} else if (fMediaServerRunning && fAddOnServerRunning) {
+				// HACK!
+				// quit our now invalid instance of the media roster
+				// so that before new nodes are created,
+				// we get a new roster
+				BMediaRoster* roster = BMediaRoster::CurrentRoster();
+				if (roster != NULL) {
+					roster->Lock();
+					roster->Quit();
 				}
+
+				BMessage reconnect(kMsgReconnectVolume);
+				BMessageRunner::StartSending(this, &reconnect, 1000000LL, 1);
+				fConnectRetries = 3;
 			}
 			break;
 		}