summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2018-05-28 14:41:20 +0300
committerTor Lillqvist <tml@collabora.com>2018-05-30 08:27:33 +0200
commit7753fe2d3a6ffd421af4fb4ce4dcebbf0377a765 (patch)
treec169288b5a0098de8470bb5172b1ed27c1a960eb
parent49a10ec8ce1f92a29b7ee9f8660b313d1d5c5c5b (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/54991
-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 edf7549a0993..7747db8ff71a 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>
@@ -326,6 +328,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
{
(void)aNotification;
sal_detail_deinitialize();
+ _Exit(0);
}
-(NSApplicationTerminateReply)applicationShouldTerminate: (NSApplication *) app