From 2929ba8686a0d6800ed21ba6d28a99661ce4501c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 14 Jun 2016 19:56:15 +0530
Subject: [PATCH] Fix crash on exit if any plugins have loaded code that raises
 exceptions during shutdown. Fixes #1592414 [Crash on quit (v2.57.1, OS X El
 Capitan)](https://bugs.launchpad.net/calibre/+bug/1592414)

---
 src/calibre/gui2/ui.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 61b98b8ce1..f5176b6eed 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -941,7 +941,15 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin,  # {{{
             pass
         self.hide_windows()
         # Do not report any errors that happen after the shutdown
-        sys.excepthook = sys.__excepthook__
+        # We cannot restore the original excepthook as that causes PyQt to
+        # call abort() on unhandled exceptions
+        import traceback
+        def eh(t, v, tb):
+            try:
+                traceback.print_exception(t, v, tb, file=sys.stderr)
+            except:
+                pass
+        sys.excepthook = eh
         if self._spare_pool is not None:
             self._spare_pool.shutdown()
         from calibre.db.delete_service import shutdown