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

Make restart work when frozen

Browse Source
This commit is contained in:
Florian Bruhin 2014-06-24 06:52:49 +02:00
parent 65353773d1
commit f3f04b6f21
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qutebrowser/app.py
View File

@ -591,23 +591,27 @@ class Application(QApplication):
urlstr = tab.url().toString() urlstr = tab.url().toString()
if urlstr: if urlstr:
pages.append(urlstr) pages.append(urlstr)
path = os.path.join(os.path.abspath(os.path.dirname(
qutebrowser.__file__)), '..')
log.destroy.debug("path: {}".format(path))
log.destroy.debug("sys.executable: {}".format(sys.executable)) log.destroy.debug("sys.executable: {}".format(sys.executable))
log.destroy.debug("sys.path: {}".format(sys.path)) log.destroy.debug("sys.path: {}".format(sys.path))
log.destroy.debug("sys.argv: {}".format(sys.argv)) log.destroy.debug("sys.argv: {}".format(sys.argv))
log.destroy.debug("frozen: {}".format(hasattr(sys, 'frozen'))) log.destroy.debug("frozen: {}".format(hasattr(sys, 'frozen')))
if hasattr(sys, 'frozen'):
args = [sys.executable]
cwd = os.path.abspath(os.path.dirname(sys.executable))
else:
args = [sys.executable, '-m', 'qutebrowser'] args = [sys.executable, '-m', 'qutebrowser']
cwd = os.path.join(os.path.abspath(os.path.dirname(
qutebrowser.__file__)), '..')
for arg in sys.argv[1:]: for arg in sys.argv[1:]:
if arg.startswith('-'): if arg.startswith('-'):
# We only want to preserve options on a restart. # We only want to preserve options on a restart.
args.append(arg) args.append(arg)
# Add all open pages so they get reopened. # Add all open pages so they get reopened.
args += pages args += pages
log.destroy.debug("final args: {}".format(args)) log.destroy.debug("args: {}".format(args))
log.destroy.debug("cwd: {}".format(cwd))
# Open a new process and immediately shutdown the existing one # Open a new process and immediately shutdown the existing one
subprocess.Popen(args, cwd=path) subprocess.Popen(args, cwd=cwd)
if shutdown: if shutdown:
self.shutdown() self.shutdown()