[Pkg-owncloud-commits] [owncloud-client] 204/218: Don't show the settings if another instance is started less than 10 secs after the apps.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit e1c634d000271a0a1c64a51596edeba784be9829
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Oct 15 14:19:46 2015 +0200

    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
---
 src/gui/application.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index e5bf787..d0db98a 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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git