[Libreoffice-commits] core.git: onlineupdate/source

[Markus Mohrhard]

 onlineupdate/source/update/updater/progressui_win.cxx |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 9e159f8b868a95ffe0998fdc8dffbbc171f6037b
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Mon Aug 21 08:46:44 2017 +0200

    updater: always show the updater UI
    
    Change-Id: I0e1dc86673779966ff247b81852fb2f29655d2b9

diff --git a/onlineupdate/source/update/updater/progressui_win.cxx 
b/onlineupdate/source/update/updater/progressui_win.cxx
index b7ff90acbbbf..24aed2c94247 100644
--- a/onlineupdate/source/update/updater/progressui_win.cxx
+++ b/onlineupdate/source/update/updater/progressui_win.cxx
@@ -228,19 +228,24 @@ InitProgressUIStrings()
     WCHAR filename[MAX_PATH];
     if (!GetStringsFile(filename))
     {
-        return -1;
+        strcpy(sUIStrings.title, "LibreOffice Updater");
+        strcpy(sUIStrings.info, "This program is updating your LibreOffice 
installation.");
+        return 0;
     }
 
     if (_waccess(filename, 04))
     {
-        return -1;
+        strcpy(sUIStrings.title, "LibreOffice Updater");
+        strcpy(sUIStrings.info, "This program is updating your LibreOffice 
installation.");
+        return 0;
     }
 
     // If the updater.ini doesn't have the required strings, then we should not
     // bother showing UI.
     if (ReadStrings(filename, &sUIStrings) != OK)
     {
-        return -1;
+        strcpy(sUIStrings.title, "LibreOffice Updater");
+        strcpy(sUIStrings.info, "This program is updating your LibreOffice 
installation.");
     }
 
     return 0;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits