diff --git a/Headphones.py b/Headphones.py index e51025e4..e457a2e5 100755 --- a/Headphones.py +++ b/Headphones.py @@ -95,9 +95,10 @@ def main(): if headphones.LAUNCH_BROWSER and not args.nolaunch: headphones.launch_browser(headphones.HTTP_HOST, http_port, headphones.HTTP_ROOT) - + # Start the background threads headphones.start() + return diff --git a/README.md b/README.md index 0bbfbfaf..0723ae22 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,6 @@ There are still a few things that I'm working on: If you run into any more issues, visit http://github.com/rembo10/headphones and report an issue. -This is free software so feel free to use it/modify it as you wish. The code is messy, but it works :-) +This is free software so feel free to use it/modify it as you wish. If you have any ideas for the next release, also make sure to post that here! \ No newline at end of file diff --git a/headphones/__init__.py b/headphones/__init__.py index 882fed07..cff12df6 100644 --- a/headphones/__init__.py +++ b/headphones/__init__.py @@ -225,7 +225,8 @@ def initialize(): except Exception, e: logger.error("Can't connect to the database: %s" % e) - # Get the currently installed version + # Get the currently installed version - returns None, 'win32' or the git hash + # Also sets INSTALL_TYPE variable to 'win', 'git' or 'source' CURRENT_VERSION = versioncheck.getVersion() __INITIALIZED__ = True @@ -394,9 +395,13 @@ def shutdown(restart=False, update=False): popen_list = [sys.executable, FULL_PATH] popen_list += ARGS - if '--nolaunch' not in popen_list: - popen_list += ['--nolaunch'] + #if '--nolaunch' not in popen_list: + # popen_list += ['--nolaunch'] logger.info('Restarting Headphones with ' + str(popen_list)) subprocess.Popen(popen_list, cwd=os.getcwd()) - os._exit(0) \ No newline at end of file + os._exit(0) + +def refresh(): + + raise cherrypy.HTTPRedirect("home") \ No newline at end of file