diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-08-02 05:39:40 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-08-02 07:38:33 +0200 |
commit | 74a3a035143b471c3edd2392b44c68c8695dcc23 (patch) | |
tree | 9997ee40e980fc8bcd179f6f5a7df1cb780f3b71 /desktop | |
parent | 682cd955c36cb97a8fd276fc57be6bdb4bb0e107 (diff) |
updater: flush the configuration changes before we call execv
Without this the external configuration writer thread might not have
written the config yet.
Change-Id: I361fd8a7ee102a8ca50899fb644a0745ed3386ca
Reviewed-on: https://gerrit.libreoffice.org/40659
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/app/app.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index c6a467682496..fe89eeb3b628 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1436,6 +1436,10 @@ int Desktop::Main() officecfg::Office::Update::Update::OldBuildID::set(aBuildID, batch); officecfg::Office::Update::Update::UpdateRunning::set(true, batch); batch->commit(); + + // make sure the change is written to the configuration before we start the update + css::uno::Reference<css::util::XFlushable> xFlushable(css::configuration::theDefaultProvider::get(xContext), UNO_QUERY);; + xFlushable->flush(); // avoid the old oosplash staying around CloseSplashScreen(); update(); |