git.videolan.org
/
vlc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1e9ff27
)
vlc.c: Make sure exiting after two Ctrl-C is instantaneous on Mac OS X.
author
Pierre d'Herbemont
<pdherbemont@videolan.org>
Sat, 23 Feb 2008 21:22:10 +0000
(21:22 +0000)
committer
Pierre d'Herbemont
<pdherbemont@videolan.org>
Sat, 23 Feb 2008 21:22:10 +0000
(21:22 +0000)
src/vlc.c
patch
|
blob
|
history
diff --git
a/src/vlc.c
b/src/vlc.c
index
b7a340a
..
e934b88
100644
(file)
--- a/
src/vlc.c
+++ b/
src/vlc.c
@@
-291,7
+291,16
@@
static void *SigHandler (void *data)
/* If user asks again more than 2 seconds later, die badly */
pthread_sigmask (SIG_UNBLOCK, exitset, NULL);
fprintf (stderr, "user insisted too much, dying badly\n");
/* If user asks again more than 2 seconds later, die badly */
pthread_sigmask (SIG_UNBLOCK, exitset, NULL);
fprintf (stderr, "user insisted too much, dying badly\n");
+#ifdef __APPLE__
+ /* On Mac OS X, use exit(-1) as it doesn't trigger
+ * backtrace generation, whereas abort() does.
+ * The backtrace generation trigger a Crash Dialog
+ * And takes way too much time, which is not what
+ * we want. */
+ exit (-1);
+#else
abort ();
abort ();
+#endif
}
pthread_setcancelstate (state, NULL);
}
}
pthread_setcancelstate (state, NULL);
}