Browse Source

On OSX, the topmenu did not always send the right URL to the browser.

tags/0.6.3
ShyPike 14 years ago
parent
commit
309c556f35
  1. 1
      SABnzbd.py
  2. 1
      sabnzbd/__init__.py
  3. 3
      sabnzbd/osxmenu.py

1
SABnzbd.py

@ -1362,6 +1362,7 @@ def main():
else:
browser_url = "http://%s:%s/sabnzbd" % (browserhost, cherryport)
sabnzbd.BROWSER_URL = browser_url
if not autorestarted:
launch_a_browser(browser_url)
notify("SAB_Launched", None)

1
sabnzbd/__init__.py

@ -114,6 +114,7 @@ GUIHANDLER = None
LOG_ALL = False
AMBI_LOCALHOST = False
WIN_SERVICE = None # Instance of our Win32 Service Class
BROWSER_URL = None
WEB_DIR = None
WEB_DIR2 = None

3
sabnzbd/osxmenu.py

@ -652,8 +652,7 @@ class SABnzbdDelegate(NSObject):
link = sender.representedObject()
else:
link = ""
#logging.info("[osx] opening http://%s:%s/sabnzbd/%s" % (sabnzbd.cfg.CHERRYHOST(), sabnzbd.cfg.CHERRYPORT(),link))
launch_a_browser("http://%s:%s/sabnzbd/%s" % (sabnzbd.cfg.cherryhost(), sabnzbd.cfg.cherryport(),link),True)
launch_a_browser(sabnzbd.BROWSER_URL, True)
def speedlimitAction_(self, sender):
#logging.info("[osx] speed limit to %s" % (sender.representedObject()))

Loading…
Cancel
Save