From f499a1c15b3b453c84555321435daf0f5e1be348 Mon Sep 17 00:00:00 2001 From: Mauricio Date: Sat, 8 Aug 2020 18:58:58 -0400 Subject: [PATCH] add icon to .spec files --- AO2XP.ico | Bin 0 -> 19502 bytes AO2XP.py | 7 ++++--- AO2XP.spec | 3 ++- AO2XP_console.ico | Bin 0 -> 20790 bytes AO2XP_console.spec | 3 ++- 5 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 AO2XP.ico create mode 100644 AO2XP_console.ico diff --git a/AO2XP.ico b/AO2XP.ico new file mode 100644 index 0000000000000000000000000000000000000000..0974d866cd51110ed159e679ea7251f229664bff GIT binary patch literal 19502 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 literal 0 HcmV?d00001 diff --git a/AO2XP.py b/AO2XP.py index c99c8d9..f1d5721 100644 --- a/AO2XP.py +++ b/AO2XP.py @@ -1,4 +1,4 @@ -import sys, thread, time +import sys, thread, time, os from os.path import exists from PyQt4 import QtGui, QtCore app = QtGui.QApplication(sys.argv) @@ -8,7 +8,7 @@ if not debugmode: fakebass = len(sys.argv) > 1 and sys.argv[1] == "bass" if not exists("bass.dll") or fakebass: QtGui.QMessageBox.critical(None, "Unable to launch game", "Couldn't find the file 'bass.dll' on the client folder.\nAO2XP needs this file in order to play sounds and music.\nThe file is included in the client's zip file, make sure it's in the same folder as AO2XP.exe") - sys.exit(2) + os._exit(-2) class gamewindow(QtGui.QMainWindow): def __init__(self): @@ -55,8 +55,9 @@ if not debugmode: if jm == QtGui.QMessageBox.Yes: import basedownloader code = basedownloader.downloadVanilla() + if code != 0: os._exit(code) else: - sys.exit(3) + os._exit(-3) from pybass import * import gameview, mainmenu, options, ini diff --git a/AO2XP.spec b/AO2XP.spec index c0b2d86..90914c4 100644 --- a/AO2XP.spec +++ b/AO2XP.spec @@ -25,4 +25,5 @@ exe = EXE(pyz, debug=False, strip=False, upx=True, - console=False) \ No newline at end of file + console=False, + icon="AO2XP.ico") \ No newline at end of file diff --git a/AO2XP_console.ico b/AO2XP_console.ico new file mode 100644 index 0000000000000000000000000000000000000000..34ee3756840c6c9f85119f1eb67894f99f2990da GIT binary patch literal 20790 zcmeHP30PIt_CE(y)aQ(vul(mc

T*z62zN)D$#K5hqj>=MfPHP;tN+1qDZN$gwab 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 J$XbD~{{U?$PsRWM literal 0 HcmV?d00001 diff --git a/AO2XP_console.spec b/AO2XP_console.spec index f38f982..9cb9b8e 100644 --- a/AO2XP_console.spec +++ b/AO2XP_console.spec @@ -25,4 +25,5 @@ exe = EXE(pyz, debug=False, strip=False, upx=True, - console=True) \ No newline at end of file + console=True, + icon="AO2XP_console.ico") \ No newline at end of file