summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorDennis Francis <dennis.francis@collabora.com>2019-06-14 10:28:47 +0530
committerAndras Timar <andras.timar@collabora.com>2019-06-19 10:55:23 +0200
commitd115d6240e09410685684016a595ca70e4b4b517 (patch)
tree52c8ee82822f5c2e3a213464f1b2f19cd59c9776 /desktop
parent3d71431e5f7a100002cd2602af15ff661084dcbd (diff)
tdf#125691: use _exit() instead of exit()...
for ExitTimer which is used exclusively for the case when OOO_EXIT_POST_STARTUP is set, so that there is no waiting around for ThreadPool's threads to get joined. Setting OOO_EXIT_POST_STARTUP already evades any proper destruction of objects in the heap, so using _exit() instead of exit() here does not make things any worse w.r.t the purpose of this env var. Change-Id: Ib4a253d6e1a3fd8593e4a2115a51cf4c10344b3c Reviewed-on: https://gerrit.libreoffice.org/74016 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit d39846bfd16ad9873795149c370a95f42363bfd9) Reviewed-on: https://gerrit.libreoffice.org/74154 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 92199ce4e544d17b4ceceefacf078c04996b57db)
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/app.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 3cc672c0b573..0a8178669d0f 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1929,7 +1929,7 @@ class ExitTimer : public Timer
}
virtual void Invoke() override
{
- exit(42);
+ _exit(42);
}
};