diff options
| -rw-r--r-- | desktop/unx/source/start.c | 4 | ||||
| -rw-r--r-- | uitest/libreoffice/connection.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c index e3e5441bf97e..f95cfe4d1eaa 100644 --- a/desktop/unx/source/start.c +++ b/desktop/unx/source/start.c @@ -718,8 +718,10 @@ static void sigterm_handler(int ignored) { (void) ignored; - if (g_pProcess) + if (g_pProcess) { osl_terminateProcess(g_pProcess); // forward signal to soffice.bin + osl_joinProcess(g_pProcess); + } _exit(255); } diff --git a/uitest/libreoffice/connection.py b/uitest/libreoffice/connection.py index 9de92e77312f..68330b47d6cf 100644 --- a/uitest/libreoffice/connection.py +++ b/uitest/libreoffice/connection.py @@ -57,7 +57,7 @@ class OfficeConnection: success = True finally: if not success and self.soffice: - self.soffice.kill() + self.soffice.terminate() self.soffice.wait() self.soffice = None |