diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2008-02-11 10:37:47 +0000 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2008-02-11 10:37:47 +0000 |
| commit | 925db34598666c82113580180118e784b4eef1d1 (patch) | |
| tree | dab3f56c16182077630fb847ff347f9572a5e628 | |
| parent | d8cd580b7ba8c046d463b17686e6280abe1ab43e (diff) | |
Finish oosplash when OOo fails during startup.ooo-build-2-3
* patches/src680/unxsplash-finish-on-hangup.diff: Finish oosplash when
OOo fails during startup. (merge from trunk)
| -rw-r--r-- | patches/src680/apply | 3 | ||||
| -rw-r--r-- | patches/src680/unxsplash-finish-on-hangup.diff | 13 |
2 files changed, 16 insertions, 0 deletions
diff --git a/patches/src680/apply b/patches/src680/apply index d6bd587c6..b04a3a795 100644 --- a/patches/src680/apply +++ b/patches/src680/apply @@ -561,6 +561,9 @@ unxsplash-rework.diff, i#60696, michael/jholesov # handling of osl pipe has changed, see i#84045 unxsplash-new-osl-pipe.diff, i#60696, jholesov +# when OOo fails during startup, don't loop endlessly +unxsplash-finish-on-hangup.diff, i#60696, n#357659, jholesov + [ QuickStarter < oog680-m8] # External splash screen implementation / 2nd time accelerator unxsplash-rework-m7.diff, i#60696, michael/jholesov diff --git a/patches/src680/unxsplash-finish-on-hangup.diff b/patches/src680/unxsplash-finish-on-hangup.diff new file mode 100644 index 000000000..466ad80a5 --- /dev/null +++ b/patches/src680/unxsplash-finish-on-hangup.diff @@ -0,0 +1,13 @@ +--- desktop/unx/source/start.c 2008-02-11 12:05:50.000000000 +0100 ++++ desktop/unx/source/start.c 2008-02-11 12:05:45.000000000 +0100 +@@ -568,7 +568,9 @@ show_splash( int status_fd ) + + /* read from pipe if data available */ + nRetval = poll( &aPfd, 1, 50 ); +- if ( nRetval > 0 ) ++ if ( aPfd.revents & ( POLLERR | POLLHUP | POLLNVAL ) ) ++ bFinish = sal_True; ++ else if ( nRetval > 0 ) + bFinish = !read_percent( status_fd, &nPercent ); + else if ( nRetval < 0 ) + bFinish = sal_True; |