diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-21 23:33:46 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-21 23:35:24 +0200 |
| commit | aa7541be959fe5406bed867c65381d17a48deda4 (patch) | |
| tree | 74af72724af2b89111557e6fbe96c34548a86253 | |
| parent | 0607102c470a67dfd7c0579a32d1c862427e2013 (diff) | |
Ensure a failing soffice.bin makes oosplash fail.
| -rwxr-xr-x | desktop/unx/source/start.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c index 37b407b66240..6ca688d04f4f 100755 --- a/desktop/unx/source/start.c +++ b/desktop/unx/source/start.c @@ -920,6 +920,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv ) const char* pUsePlugin; rtl_uString *pPipePath = NULL; Args *args; + int status = 0; /* turn SIGPIPE into an error */ signal( SIGPIPE, SIG_IGN ); @@ -1022,7 +1023,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv ) fprintf (stderr, "Exited with code '%d'\n", child_get_exit_code (info)); #endif - switch (child_get_exit_code (info)) { + status = child_get_exit_code(info); + switch (status) { case 79: // re-start with just -env: parameters #if OSL_DEBUG_LEVEL > 0 fprintf (stderr, "oosplash: re-start with just -env: params !\n"); @@ -1049,7 +1051,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv ) rtl_uString_release( pPipePath ); args_free (args); - return 0; + return status; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |