oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1926 from 0polar/patch-4

Browse source 
Fix unable to open context menu on Windows
This commit is contained in:
ZeroNet 2019-03-19 16:42:21 +01:00 committed by GitHub
commit ccc8fda24f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/Trayicon/TrayiconPlugin.py
View file

@ -124,9 +124,9 @@ class ActionsPlugin(object):
if not getattr(sys, 'frozen', False): # Not frozen
args.insert(0, sys.executable)
cwd = os.getcwd().decode(sys.getfilesystemencoding())
cwd = os.getcwd()
else:
cwd = os.path.dirname(sys.executable).decode(sys.getfilesystemencoding())
cwd = os.path.dirname(sys.executable)
if sys.platform == 'win32':
args = ['"%s"' % arg for arg in args if arg]
@ -135,7 +135,6 @@ class ActionsPlugin(object):
# Dont open browser on autorun
cmd = cmd.replace("start.py", "zeronet.py").replace('"--open_browser"', "").replace('"default_browser"', "").strip()
cmd += ' --open_browser ""'
cmd = cmd.decode(sys.getfilesystemencoding())
return """
@echo off
@ -147,7 +146,7 @@ class ActionsPlugin(object):
def isAutorunEnabled(self):
path = self.getAutorunPath()
return os.path.isfile(path) and open(path).read().decode("utf8") == self.formatAutorun()
return os.path.isfile(path) and open(path).read() == self.formatAutorun()
def titleAutorun(self):
translate = _["Start ZeroNet when Windows starts"]
@ -160,4 +159,4 @@ class ActionsPlugin(object):
if self.isAutorunEnabled():
os.unlink(self.getAutorunPath())
else:
open(self.getAutorunPath(), "w").write(self.formatAutorun().encode("utf8"))
open(self.getAutorunPath(), "w").write(self.formatAutorun())