rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't reopen opened URLs after crash

Browse Source
This commit is contained in:
Florian Bruhin 2014-04-22 14:02:29 +02:00
parent b794739d94
commit 10acc854c4
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qutebrowser/app.py
View File

@ -84,12 +84,14 @@ class QuteBrowser(QApplication):
_shutting_down: True if we're currently shutting down. _shutting_down: True if we're currently shutting down.
_quit_status: The current quitting status. _quit_status: The current quitting status.
_mode: The mode we're currently in. _mode: The mode we're currently in.
_opened_urls: List of opened URLs.
""" """
def __init__(self): def __init__(self):
super().__init__(sys.argv) super().__init__(sys.argv)
self._quit_status = {} self._quit_status = {}
self._timers = [] self._timers = []
self._opened_urls = []
self._shutting_down = False self._shutting_down = False
self._mode = None self._mode = None
@ -211,6 +213,7 @@ class QuteBrowser(QApplication):
self.commandparser.run(e.lstrip(':')) self.commandparser.run(e.lstrip(':'))
else: else:
logging.debug('Startup url {}'.format(e)) logging.debug('Startup url {}'.format(e))
self._opened_urls.append(e)
self.mainwindow.tabs.tabopen(e) self.mainwindow.tabs.tabopen(e)
if self.mainwindow.tabs.count() == 0: if self.mainwindow.tabs.count() == 0:
@ -370,9 +373,13 @@ class QuteBrowser(QApplication):
ret = dlg.exec_() ret = dlg.exec_()
if ret == QDialog.Accepted: # restore if ret == QDialog.Accepted: # restore
os.environ['PYTHONPATH'] = os.pathsep.join(sys.path) os.environ['PYTHONPATH'] = os.pathsep.join(sys.path)
# FIXME we might want to use argparse's features to not open pages argv = sys.argv[:]
# again if they were opened via cmdline for page in self._opened_urls:
argv = [sys.executable] + sys.argv + pages try:
argv.remove(page)
except ValueError:
pass
argv = [sys.executable] + argv + pages
logging.debug('Running {} with args {}'.format(sys.executable, logging.debug('Running {} with args {}'.format(sys.executable,
argv)) argv))
subprocess.Popen(argv) subprocess.Popen(argv)