diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-11-08 16:17:47 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-11-08 16:23:55 +0100 |
| commit | ffca4280ae641a6dedc0503d819976839c445f18 (patch) | |
| tree | 126a26896c6aa2a5248b9834028c7090c2a5fe9c /desktop/scripts | |
| parent | 27e2e9cf0e1400be3ca8881ca8e9d08858e04589 (diff) | |
Restart soffice.bin when necessary.
In some cases, like when the migration is in progress, or when new extensions
are registered, soffice.bin dies with a 'restart' me status. This implements
the correct handling of this state in oosplash.bin.
Diffstat (limited to 'desktop/scripts')
| -rw-r--r-- | desktop/scripts/soffice.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index ad8e6efd4dd6..006f28d5250d 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -84,11 +84,10 @@ done if [ "$sd_binary" = "soffice.bin" -a -x "$sd_prog/oosplash.bin" ] && [ "$no_oosplash" != "y" ] ; then sd_binary="oosplash.bin" - export QSTART_CHECK_ONLY=1 - if "$sd_prog/$sd_binary" -qsend-and-report $*; then + # try to connect to a running instance early + if "$sd_prog/$sd_binary" -qsend-and-report "$@" ; then exit 0 fi - unset QSTART_CHECK_ONLY fi # pagein |