diff options
Diffstat (limited to 'singleapplication.cpp')
-rw-r--r-- | singleapplication.cpp | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/singleapplication.cpp b/singleapplication.cpp index bb50f49..34d9b1d 100644 --- a/singleapplication.cpp +++ b/singleapplication.cpp @@ -47,7 +47,19 @@ SingleApplicationPrivate::SingleApplicationPrivate( SingleApplication *q_ptr ) : SingleApplicationPrivate::~SingleApplicationPrivate() { - cleanUp(); + if( socket != nullptr ) { + socket->close(); + delete socket; + } + memory->lock(); + InstancesInfo* inst = (InstancesInfo*)memory->data(); + if( server != nullptr ) { + server->close(); + delete server; + inst->primary = false; + } + memory->unlock(); + delete memory; } void SingleApplicationPrivate::genBlockServerName( int timeout ) @@ -230,22 +242,6 @@ void SingleApplicationPrivate::connectToPrimary( int msecs, char connectionType QMutex SingleApplicationPrivate::sharedMemMutex; #endif -void SingleApplicationPrivate::cleanUp() { - if( socket != nullptr ) { - socket->close(); - delete socket; - } - memory->lock(); - InstancesInfo* inst = (InstancesInfo*)memory->data(); - if( server != nullptr ) { - server->close(); - delete server; - inst->primary = false; - } - memory->unlock(); - delete memory; -} - /** * @brief Executed when a connection has been made to the LocalServer */ |