Merge pull request #100 from emericg/mobileexit

Fix a crash when exiting an application on Android and iOS

1 files changed, 14 insertions, 12 deletions

diff --git a/singleapplication_p.cpp b/singleapplication_p.cpp
index ce50383..70be683 100644
--- a/singleapplication_p.cpp
+++ b/singleapplication_p.cpp
@@ -69,19 +69,21 @@ SingleApplicationPrivate::~SingleApplicationPrivate()
         delete socket;
     }
 
-    memory->lock();
-    InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
-    if( server != nullptr ) {
-        server->close();
-        delete server;
-        inst->primary = false;
-        inst->primaryPid = -1;
-        inst->primaryUser[0] =  '\0';
-        inst->checksum = blockChecksum();
-    }
-    memory->unlock();
+    if( memory != nullptr ) {
+        memory->lock();
+        InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
+        if( server != nullptr ) {
+            server->close();
+            delete server;
+            inst->primary = false;
+            inst->primaryPid = -1;
+            inst->primaryUser[0] =  '\0';
+            inst->checksum = blockChecksum();
+        }
+        memory->unlock();
 
-    delete memory;
+        delete memory;
+    }
 }
 
 QString SingleApplicationPrivate::getUsername()