[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - desktop/source

[Dennis Francis (via logerrit)]

 desktop/source/app/app.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 92199ce4e544d17b4ceceefacf078c04996b57db
Author:     Dennis Francis <dennis.francis at collabora.com>
AuthorDate: Fri Jun 14 10:28:47 2019 +0530
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Mon Jun 17 14:32:59 2019 +0200

    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 at collabora.com>
    (cherry picked from commit d39846bfd16ad9873795149c370a95f42363bfd9)
    Reviewed-on: https://gerrit.libreoffice.org/74154
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 95b03bb2f46d..975108b5f052 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1928,7 +1928,7 @@ class ExitTimer : public Timer
     }
     virtual void Invoke() override
     {
-        exit(42);
+        _exit(42);
     }
 };