summaryrefslogtreecommitdiffstats
path: root/desktop
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-04-21 22:57:59 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-05-19 03:43:30 +0200
commita1ae46afb9068e0d1408d27f6e6b433143bb9131 (patch)
tree96e22de7bd91eefafe0173ac5830489d6180325d /desktop
parentnormalize path for updater (diff)
downloadcore-a1ae46afb9068e0d1408d27f6e6b433143bb9131.tar.gz
core-a1ae46afb9068e0d1408d27f6e6b433143bb9131.zip
either try to install an update or check for update
Change-Id: Id1e879598ef34715786e10e163ed1e4689f3137a
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/app.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index f664d6e969e5..388b45dfb943 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1490,8 +1490,7 @@ int Desktop::Main()
update();
}
}
-
- if (isTimeForUpdateCheck())
+ else if (isTimeForUpdateCheck())
{
sal_uInt64 nNow = tools::Time::GetSystemTicks();
std::shared_ptr< comphelper::ConfigurationChanges > batch(