[Pkg-owncloud-commits] [owncloud-client] 343/498: Win32: Do not silent-update if the application is already up-to-date

[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 724c0c2953bfeca42d0931a4a3531252a80f8465
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Thu Jul 16 17:26:53 2015 +0200

    Win32: Do not silent-update if the application is already up-to-date
    
    Fixes #3368
---
 src/gui/updater/ocupdater.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/updater/ocupdater.cpp b/src/gui/updater/ocupdater.cpp
index d201fcf..1a31afa 100644
--- a/src/gui/updater/ocupdater.cpp
+++ b/src/gui/updater/ocupdater.cpp
@@ -50,7 +50,8 @@ bool OCUpdater::performUpdate()
     ConfigFile cfg;
     QSettings settings(cfg.configFile(), QSettings::IniFormat);
     QString updateFile = settings.value(updateAvailableC).toString();
-    if (!updateFile.isEmpty() && QFile(updateFile).exists()) {
+    if (!updateFile.isEmpty() && QFile(updateFile).exists()
+            && !updateSucceeded() /* Someone might have run the updater manually between restarts */ ) {
         const QString name = Theme::instance()->appNameGUI();
         if (QMessageBox::information(0, tr("New %1 Update Ready").arg(name),
                                      tr("A new update for %1 is about to be installed. The updater may ask\n"

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