From de7c6a63b48f66e164bf4baa6e892bcbb326d6b9 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 6 May 2014 10:53:38 +0200
Subject: [PATCH] Fix shutdown of networkmanager

---
 TODO                           |  2 ++
 qutebrowser/app.py             | 44 +++++++++++++++++++++-------------
 qutebrowser/widgets/webview.py |  6 -----
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/TODO b/TODO
index d60eafb02..6955fb510 100644
--- a/TODO
+++ b/TODO
@@ -110,6 +110,8 @@ Major features
 Minor features
 ==============
 
+- Enable disk caching
+    QNetworkManager.setCache() and use a QNetworkDiskCache probably
 - clear cookies
 - keybind/aliases should have completion for commands/arguments
 - Hiding scrollbars
diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index ef35657ac..8e1896c34 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -20,9 +20,9 @@
 import os
 import sys
 import logging
-import functools
 import subprocess
 import configparser
+from functools import partial
 from signal import signal, SIGINT
 from argparse import ArgumentParser
 from base64 import b64encode
@@ -102,7 +102,11 @@ class QuteBrowser(QApplication):
 
     def __init__(self):
         super().__init__(sys.argv)
-        self._quit_status = {}
+        self._quit_status = {
+            'crash': True,
+            'tabs': False,
+            'networkmanager': False
+        }
         self._timers = []
         self._opened_urls = []
         self._shutting_down = False
@@ -392,6 +396,8 @@ class QuteBrowser(QApplication):
         exc = (exctype, excvalue, tb)
         sys.__excepthook__(*exc)
 
+        self._quit_status['crash'] = False
+
         if not issubclass(exctype, Exception):
             # probably a KeyboardInterrupt
             try:
@@ -399,8 +405,6 @@ class QuteBrowser(QApplication):
                 return
             except Exception:
                 self.quit()
-        self._quit_status['crash'] = False
-        self._quit_status['shutdown'] = False
         try:
             pages = self._recover_pages()
         except Exception:
@@ -483,49 +487,55 @@ class QuteBrowser(QApplication):
 
     @pyqtSlot()
     @cmdutils.register(instance='', name=['quit', 'q'], nargs=0)
-    def shutdown(self, do_quit=True):
+    def shutdown(self):
         """Try to shutdown everything cleanly.
 
         For some reason lastWindowClosing sometimes seem to get emitted twice,
         so we make sure we only run once here.
-
-        Args:
-            do_quit: Whether to quit after shutting down.
         """
         if self._shutting_down:
             return
         self._shutting_down = True
-        logging.debug("Shutting down... (do_quit={})".format(do_quit))
+        logging.debug("Shutting down...")
+        # Save config
         if self.config.get('general', 'auto-save-config'):
             try:
                 self.config.save()
             except AttributeError:
                 logging.exception("Could not save config.")
+        # Save command history
         try:
             self.cmd_history.save()
         except AttributeError:
             logging.exception("Could not save command history.")
+        # Save window state
         try:
             self._save_geometry()
             self.stateconfig.save()
         except AttributeError:
             logging.exception("Could not save window geometry.")
+        # Save cookies
         try:
             self.cookiejar.save()
         except AttributeError:
             logging.exception("Could not save cookies.")
+        # Shut down tabs
         try:
-            if do_quit:
-                self.mainwindow.tabs.shutdown_complete.connect(
-                    self.on_tab_shutdown_complete)
-            else:
-                self.mainwindow.tabs.shutdown_complete.connect(
-                    functools.partial(self._maybe_quit, 'shutdown'))
+            self.mainwindow.tabs.shutdown_complete.connect(partial(
+                self._maybe_quit, 'tabs'))
             self.mainwindow.tabs.shutdown()
         except AttributeError:  # mainwindow or tabs could still be None
             logging.exception("No mainwindow/tabs to shut down.")
-            if do_quit:
-                self.quit()
+            self._maybe_quit('tabs')
+        # Shut down networkmanager
+        try:
+            self.networkmanager.abort_requests()
+            self.networkmanager.destroyed.connect(partial(
+                self._maybe_quit, 'networkmanager'))
+            self.networkmanager.deleteLater()
+        except AttributeError:
+            logging.exception("No networkmanager to shut down.")
+            self._maybe_quit('networkmanager')
 
     @pyqtSlot()
     def on_tab_shutdown_complete(self):
diff --git a/qutebrowser/widgets/webview.py b/qutebrowser/widgets/webview.py
index dec2165a8..6ccdd7fce 100644
--- a/qutebrowser/widgets/webview.py
+++ b/qutebrowser/widgets/webview.py
@@ -208,12 +208,6 @@ class WebView(QWebView):
         self._destroyed[self] = False
         self.destroyed.connect(functools.partial(self._on_destroyed, self))
         self.deleteLater()
-
-        netman = QApplication.instance().networkmanager
-        self._destroyed[netman] = False
-        netman.abort_requests()
-        netman.destroyed.connect(functools.partial(self._on_destroyed, netman))
-        netman.deleteLater()
         logging.debug("Tab shutdown scheduled")
 
     @pyqtSlot(str)