make automatic updates opt-in / temporarily disable updates as there are no releases
This commit is contained in:
parent
a63d1c9952
commit
f73b3422d1
2
AO2XP.py
2
AO2XP.py
@ -81,7 +81,7 @@ if not debugmode:
|
|||||||
os._exit(-3)
|
os._exit(-3)
|
||||||
|
|
||||||
# AO2XP update checker
|
# AO2XP update checker
|
||||||
can_update = ini.read_ini_bool("AO2XP.ini", "General", "install updates", True)
|
can_update = ini.read_ini_bool("AO2XP.ini", "General", "install updates", False) # Automatic updates are opt-in!
|
||||||
force_update = "forceupdate" in sys.argv[1:]
|
force_update = "forceupdate" in sys.argv[1:]
|
||||||
if can_update or force_update:
|
if can_update or force_update:
|
||||||
import updater
|
import updater
|
||||||
|
@ -207,7 +207,7 @@ class Settings(QtGui.QDialog):
|
|||||||
self.allowdownload_evidence.setChecked(ini.read_ini_bool(self.inifile, "General", "download evidence"))
|
self.allowdownload_evidence.setChecked(ini.read_ini_bool(self.inifile, "General", "download evidence"))
|
||||||
self.currtheme.setCurrentIndex(self.themes.index(ini.read_ini(self.inifile, "General", "theme", "default")))
|
self.currtheme.setCurrentIndex(self.themes.index(ini.read_ini(self.inifile, "General", "theme", "default")))
|
||||||
self.autoconnect.setCurrentIndex(ini.read_ini_int(self.inifile, "General", "auto connect", -1) + 1)
|
self.autoconnect.setCurrentIndex(ini.read_ini_int(self.inifile, "General", "auto connect", -1) + 1)
|
||||||
self.check_updates.setChecked(ini.read_ini_bool(self.inifile, "General", "install updates", True))
|
self.check_updates.setChecked(ini.read_ini_bool(self.inifile, "General", "install updates", False)) # Automatic updates are opt-in!
|
||||||
|
|
||||||
self.device_list.setCurrentIndex(ini.read_ini_int(self.inifile, "Audio", "device", audio.getcurrdevice()))
|
self.device_list.setCurrentIndex(ini.read_ini_int(self.inifile, "Audio", "device", audio.getcurrdevice()))
|
||||||
self.musicslider.setValue(ini.read_ini_int(self.inifile, "Audio", "Music volume", 100))
|
self.musicslider.setValue(ini.read_ini_int(self.inifile, "Audio", "Music volume", 100))
|
||||||
|
@ -118,7 +118,8 @@ class updateThread(QtCore.QThread):
|
|||||||
global returncode
|
global returncode
|
||||||
|
|
||||||
try:
|
try:
|
||||||
manifest = json.load(BytesIO(requests.get("http://api.github.com/repos/headshot2017/AO2XP/releases").content))
|
manifest = json.load(BytesIO(requests.get("").content))
|
||||||
|
#manifest = json.load(BytesIO(requests.get("http://api.github.com/repos/headshot2017/AO2XP/releases").content))
|
||||||
except:
|
except:
|
||||||
print traceback.format_exc()
|
print traceback.format_exc()
|
||||||
self.showMessageBox.emit("critical", "Error", "Failed to check for updates.\nPlease check your internet connection.")
|
self.showMessageBox.emit("critical", "Error", "Failed to check for updates.\nPlease check your internet connection.")
|
||||||
|
Loading…
Reference in New Issue
Block a user