Merge pull request #100 from emericg/mobileexit

Fix a crash when exiting an application on Android and iOS
This commit is contained in:
Itay Grudev 2020-04-21 08:35:27 +01:00 committed by GitHub
commit 69b94ec452
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -69,19 +69,21 @@ SingleApplicationPrivate::~SingleApplicationPrivate()
delete socket; delete socket;
} }
memory->lock(); if( memory != nullptr ) {
InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data()); memory->lock();
if( server != nullptr ) { InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
server->close(); if( server != nullptr ) {
delete server; server->close();
inst->primary = false; delete server;
inst->primaryPid = -1; inst->primary = false;
inst->primaryUser[0] = '\0'; inst->primaryPid = -1;
inst->checksum = blockChecksum(); inst->primaryUser[0] = '\0';
} inst->checksum = blockChecksum();
memory->unlock(); }
memory->unlock();
delete memory; delete memory;
}
} }
QString SingleApplicationPrivate::getUsername() QString SingleApplicationPrivate::getUsername()