summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2018-05-28 14:41:20 +0300
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2018-05-29 22:04:30 +0200
commitb1eeeaccc3337510df93b147f5905fca3416fc48 (patch)
tree4fbae0dc753052adc930f9826a588f36c872c803
parent257014ce03dee29506e8e70c204e912c4ed33172 (diff)
tdf#117850: Just call _Exit() in our applicationWillTerminate:
Sure, it is just a workaround, but a very effective workaround. Change-Id: Id0daff048a27dae5cf8fb5e0e949c5b21e03fc86 Reviewed-on: https://gerrit.libreoffice.org/54924 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit aa81a086bd3dcd7d6b830951619f310bd0aff30c) Reviewed-on: https://gerrit.libreoffice.org/54995 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--vcl/osx/vclnsapp.mm3
1 files changed, 3 insertions, 0 deletions
diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm
index 09c3a8001f2d..61dac67b5d77 100644
--- a/vcl/osx/vclnsapp.mm
+++ b/vcl/osx/vclnsapp.mm
@@ -22,6 +22,8 @@
#include <vector>
+#include <stdlib.h>
+
#include <sal/main.h>
#include <vcl/commandevent.hxx>
#include <vcl/ImageTree.hxx>
@@ -314,6 +316,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
{
(void)aNotification;
sal_detail_deinitialize();
+ _Exit(0);
}
-(NSApplicationTerminateReply)applicationShouldTerminate: (NSApplication *) app