From 3e83f5ce13c06bf6c65fb369d152cd570d718bcb Mon Sep 17 00:00:00 2001 From: Itay Grudev Date: Wed, 9 Sep 2020 02:28:07 +0100 Subject: Improved the connectToPrimary() method and fixed issue with instanceStarted() not getting emitted --- singleapplication.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'singleapplication.cpp') diff --git a/singleapplication.cpp b/singleapplication.cpp index 9b58bf8..d369aa1 100644 --- a/singleapplication.cpp +++ b/singleapplication.cpp @@ -85,7 +85,7 @@ SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSeconda abortSafely(); } } else { - qCritical() << "SingleApplication: Unable create block."; + qCritical() << "SingleApplication: Unable to create block."; abortSafely(); } } @@ -238,7 +238,8 @@ bool SingleApplication::sendMessage( const QByteArray &message, int timeout ) if( isPrimary() ) return false; // Make sure the socket is connected - d->connectToPrimary( timeout, SingleApplicationPrivate::Reconnect ); + if( ! d->connectToPrimary( timeout, SingleApplicationPrivate::Reconnect ) ) + return false; d->socket->write( message ); bool dataWritten = d->socket->waitForBytesWritten( timeout ); @@ -254,7 +255,7 @@ void SingleApplication::abortSafely() { Q_D( SingleApplication ); - qCritical() << d->memory->errorString(); + qCritical() << "SingleApplication: " << d->memory->error() << d->memory->errorString(); delete d; ::exit( EXIT_FAILURE ); } -- cgit v1.2.1