From b4a1f19d81b22b62bf20f6e60f9753d937fd9b03 Mon Sep 17 00:00:00 2001 From: Emeric Date: Mon, 20 Apr 2020 18:33:30 +0200 Subject: Fix a crash when exiting an application on Android and iOS --- singleapplication_p.cpp | 26 ++++++++++++++------------ 1 file 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(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(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() -- cgit v1.2.1