Merge pull request #3468 from owncloud/3368

Win32: Do not silent-update if the application is already up-to-date
This commit is contained in:
Daniel Molkentin 2015-07-16 23:02:06 +02:00
commit 59f93b77c3

View file

@ -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"