From 30ce2c98e958cdd10e29b47210f2d24d57c6837f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 4 Jun 2014 23:17:22 +0200
Subject: [PATCH] Disable broken :restart for now

---
 BUGS               |  2 ++
 qutebrowser/app.py | 50 +++++++++++++++++++++++-----------------------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/BUGS b/BUGS
index a7bb4d811..9b243e1d9 100644
--- a/BUGS
+++ b/BUGS
@@ -16,6 +16,8 @@ Bugs
 
 - restart sometimes abort()s on QApplication __init__ (V155)
 
+- restart is broken entirely since init refactoring (around af19e6d~1)
+
 - qutebrowser :restart loops endlessly
     We should refuse to do :restart when executing init commands
 
diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index 1c5317e58..8bbfcb676 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -481,31 +481,31 @@ class Application(QApplication):
             log.destroy.debug("maybe_quit quitting.")
             self.quit()
 
-    @cmdutils.register(instance='', nargs=0)
-    def restart(self, shutdown=True, pages=None):
-        """Restart qutebrowser while keeping existing tabs open."""
-        # We don't use _recover_pages here as it's too forgiving when
-        # exceptions occur.
-        if pages is None:
-            pages = []
-            for tab in self.mainwindow.tabs.widgets:
-                url = tab.url().toString()
-                if url:
-                    pages.append(url)
-        pythonpath = os.pathsep.join(sys.path)
-        os.environ['PYTHONPATH'] = pythonpath
-        argv = sys.argv[:]
-        for page in self._opened_urls:
-            try:
-                argv.remove(page)
-            except ValueError:
-                pass
-        argv = [sys.executable] + argv + pages
-        log.procs.debug("Running {} with args {} (PYTHONPATH={})".format(
-            sys.executable, argv, pythonpath))
-        subprocess.Popen(argv)
-        if shutdown:
-            self.shutdown()
+    #@cmdutils.register(instance='', nargs=0)
+    #def restart(self, shutdown=True, pages=None):
+    #    """Restart qutebrowser while keeping existing tabs open."""
+    #    # We don't use _recover_pages here as it's too forgiving when
+    #    # exceptions occur.
+    #    if pages is None:
+    #        pages = []
+    #        for tab in self.mainwindow.tabs.widgets:
+    #            url = tab.url().toString()
+    #            if url:
+    #                pages.append(url)
+    #    pythonpath = os.pathsep.join(sys.path)
+    #    os.environ['PYTHONPATH'] = pythonpath
+    #    argv = sys.argv[:]
+    #    for page in self._opened_urls:
+    #        try:
+    #            argv.remove(page)
+    #        except ValueError:
+    #            pass
+    #    argv = [sys.executable] + argv + pages
+    #    log.procs.debug("Running {} with args {} (PYTHONPATH={})".format(
+    #        sys.executable, argv, pythonpath))
+    #    subprocess.Popen(argv)
+    #    if shutdown:
+    #        self.shutdown()
 
     @cmdutils.register(instance='', split=False)
     def pyeval(self, s):