From cf6e88f4a8a5b159dafa83c40fc642038ec54c52 Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Mon, 22 Aug 2016 16:25:45 +0200
Subject: don't run the updates when the updater has been disabled

Change-Id: I9cf046d94ec0db2af965380f6e0935f0193e427d
---
 desktop/source/app/app.cxx | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 735266586666..7b797d077755 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -92,6 +92,7 @@
 #include <unotools/localfilehelper.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <officecfg/Office/Recovery.hxx>
+#include <officecfg/Office/Update.hxx>
 #include <officecfg/Setup.hxx>
 #include <osl/file.hxx>
 #include <osl/process.h>
@@ -1451,17 +1452,21 @@ int Desktop::Main()
         if ( !InitializeConfiguration() )
             return EXIT_FAILURE;
 
-        OUString aInstallationDir( "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER );
+        if (officecfg::Office::Update::Update::Enabled::get())
+        {
 
-        CreateValidUpdateDir(aInstallationDir);
+            OUString aInstallationDir( "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER );
 
-        osl::DirectoryItem aDirectoryItem;
-        osl::DirectoryItem::get("file:///lo/users/moggi/test-inst/updated"/*aInstallationDir + "/updated"*/, aDirectoryItem);
-        bool bValidUpdateDirExists = aDirectoryItem.is();
-        if (bValidUpdateDirExists)
-        {
-            rtl::Bootstrap::expandMacros(aInstallationDir);
-            Update(aInstallationDir);
+            CreateValidUpdateDir(aInstallationDir);
+
+            osl::DirectoryItem aDirectoryItem;
+            osl::DirectoryItem::get("file:///lo/users/moggi/test-inst/updated"/*aInstallationDir + "/updated"*/, aDirectoryItem);
+            bool bValidUpdateDirExists = aDirectoryItem.is();
+            if (bValidUpdateDirExists)
+            {
+                rtl::Bootstrap::expandMacros(aInstallationDir);
+                Update(aInstallationDir);
+            }
         }
 
         SetSplashScreenProgress(30);
-- 
cgit v1.2.3