From: Olivier Goffart Date: Thu, 15 Oct 2015 12:19:46 +0000 (+0200) Subject: Don't show the settings if another instance is started less than 10 secs after the... X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1395^2~40 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e1c634d000271a0a1c64a51596edeba784be9829;p=nextcloud-desktop.git Don't show the settings if another instance is started less than 10 secs after the apps. Issue #3273 isSessionRestored was not set correctlty so ignore it --- diff --git a/src/gui/application.cpp b/src/gui/application.cpp index e5bf78777..d0db98ae4 100644 --- a/src/gui/application.cpp +++ b/src/gui/application.cpp @@ -306,7 +306,7 @@ void Application::slotParseMessage(const QString &msg, QObject*) setupLogging(); } else if (msg.startsWith(QLatin1String("MSG_SHOWSETTINGS"))) { qDebug() << "Running for" << _startedAt.elapsed()/1000.0 << "sec"; - if (isSessionRestored() && _startedAt.elapsed() < 10*1000) { + if (_startedAt.elapsed() < 10*1000) { // This call is mirrored with the one in int main() qWarning() << "Ignoring MSG_SHOWSETTINGS, possibly double-invocation of client via session restore and auto start"; return;