From b165cfeaa2cb456b79e278ea1f71a317e484341c Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Mon, 15 May 2017 11:33:13 +0200
Subject: [PATCH] fix(src/externals/single-application/SingleApplication):
 coding style

---
 .../single-application/SingleApplication.cpp  | 45 ++++++++++---------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/linphone-desktop/src/externals/single-application/SingleApplication.cpp b/linphone-desktop/src/externals/single-application/SingleApplication.cpp
index d55582271..19e317e64 100644
--- a/linphone-desktop/src/externals/single-application/SingleApplication.cpp
+++ b/linphone-desktop/src/externals/single-application/SingleApplication.cpp
@@ -389,32 +389,35 @@ SingleApplication::SingleApplication (int &argc, char *argv[], bool allowSeconda
   if (d->memory->create(sizeof(InstancesInfo))) {
     d->startPrimary(true);
     return;
-  } else {
-    // Attempt to attach to the memory segment
-    if (d->memory->attach()) {
-      d->memory->lock();
-      InstancesInfo *inst = static_cast<InstancesInfo *>(d->memory->data());
+  }
 
-      if (!inst->primary) {
-        d->startPrimary(false);
-        d->memory->unlock();
-        return;
-      }
+  // Attempt to attach to the memory segment
+  if (d->memory->attach()) {
+    d->memory->lock();
 
-      // Check if another instance can be started
-      if (allowSecondary) {
-        inst->secondary += 1;
-        d->instanceNumber = inst->secondary;
-        d->startSecondary();
-        if (d->options & Mode::SecondaryNotification) {
-          d->connectToPrimary(timeout, SecondaryInstance);
-        }
-        d->memory->unlock();
-        return;
-      }
+    InstancesInfo *inst = static_cast<InstancesInfo *>(d->memory->data());
+
+    if (!inst->primary) {
+      d->startPrimary(false);
+      d->memory->unlock();
+      return;
+    }
+
+    // Check if another instance can be started
+    if (allowSecondary) {
+      inst->secondary += 1;
+      d->instanceNumber = inst->secondary;
+
+      d->startSecondary();
+      if (d->options & Mode::SecondaryNotification)
+        d->connectToPrimary(timeout, SecondaryInstance);
 
       d->memory->unlock();
+
+      return;
     }
+
+    d->memory->unlock();
   }
 
   d->connectToPrimary(timeout, NewInstance);