| @@ -28,7 +28,7 @@ if __name__ == '__main__': | |||||
| # ------------------------------------------------------------- | # ------------------------------------------------------------- | ||||
| # Read CLI args | # Read CLI args | ||||
| initName, libPrefix = handleInitialCommandLineArguments(__file__ if "__file__" in dir() else sys.argv[0]) | |||||
| initName, libPrefix = handleInitialCommandLineArguments(__file__ if "__file__" in dir() else None) | |||||
| # ------------------------------------------------------------- | # ------------------------------------------------------------- | ||||
| # App initialization | # App initialization | ||||
| @@ -28,7 +28,7 @@ if __name__ == '__main__': | |||||
| # ------------------------------------------------------------- | # ------------------------------------------------------------- | ||||
| # Read CLI args | # Read CLI args | ||||
| initName, libPrefix = handleInitialCommandLineArguments(__file__ if "__file__" in dir() else sys.argv[0]) | |||||
| initName, libPrefix = handleInitialCommandLineArguments(__file__ if "__file__" in dir() else None) | |||||
| for arg in sys.argv: | for arg in sys.argv: | ||||
| if arg.startswith("osc."): | if arg.startswith("osc."): | ||||
| @@ -28,7 +28,7 @@ if __name__ == '__main__': | |||||
| # ------------------------------------------------------------- | # ------------------------------------------------------------- | ||||
| # Read CLI args | # Read CLI args | ||||
| initName, libPrefix = handleInitialCommandLineArguments(__file__ if "__file__" in dir() else sys.argv[0]) | |||||
| initName, libPrefix = handleInitialCommandLineArguments(__file__ if "__file__" in dir() else None) | |||||
| # ------------------------------------------------------------- | # ------------------------------------------------------------- | ||||
| # App initialization | # App initialization | ||||
| @@ -28,7 +28,7 @@ if __name__ == '__main__': | |||||
| # ------------------------------------------------------------- | # ------------------------------------------------------------- | ||||
| # Read CLI args | # Read CLI args | ||||
| initName, libPrefix = handleInitialCommandLineArguments(__file__ if "__file__" in dir() else sys.argv[0]) | |||||
| initName, libPrefix = handleInitialCommandLineArguments(__file__ if "__file__" in dir() else None) | |||||
| # ------------------------------------------------------------- | # ------------------------------------------------------------- | ||||
| # App initialization | # App initialization | ||||
| @@ -1708,7 +1708,7 @@ if __name__ == '__main__': | |||||
| from carla_app import CarlaApplication | from carla_app import CarlaApplication | ||||
| from carla_host import initHost, loadHostSettings | from carla_host import initHost, loadHostSettings | ||||
| initName, libPrefix = handleInitialCommandLineArguments(__file__ if "__file__" in dir() else sys.argv[0]) | |||||
| initName, libPrefix = handleInitialCommandLineArguments(__file__ if "__file__" in dir() else None) | |||||
| app = CarlaApplication("Carla2-Database", libPrefix) | app = CarlaApplication("Carla2-Database", libPrefix) | ||||
| host = initHost("Carla2-Database", libPrefix, False, False, False) | host = initHost("Carla2-Database", libPrefix, False, False, False) | ||||
| @@ -851,7 +851,7 @@ if __name__ == '__main__': | |||||
| from carla_app import CarlaApplication | from carla_app import CarlaApplication | ||||
| from carla_host import initHost, loadHostSettings | from carla_host import initHost, loadHostSettings | ||||
| initName, libPrefix = handleInitialCommandLineArguments(__file__ if "__file__" in dir() else sys.argv[0]) | |||||
| initName, libPrefix = handleInitialCommandLineArguments(__file__ if "__file__" in dir() else None) | |||||
| app = CarlaApplication("Carla2-Settings", libPrefix) | app = CarlaApplication("Carla2-Settings", libPrefix) | ||||
| host = initHost("Carla2-Settings", libPrefix, False, False, False) | host = initHost("Carla2-Settings", libPrefix, False, False, False) | ||||
| @@ -545,7 +545,7 @@ def getIcon(icon, size = 16): | |||||
| # Handle some basic command-line arguments shared between all carla variants | # Handle some basic command-line arguments shared between all carla variants | ||||
| def handleInitialCommandLineArguments(file): | def handleInitialCommandLineArguments(file): | ||||
| initName = os.path.basename(file) if ("__file__" in dir() and os.path.dirname(file) in PATH) else sys.argv[0] | |||||
| initName = os.path.basename(file) if (file is not None and os.path.dirname(file) in PATH) else sys.argv[0] | |||||
| libPrefix = None | libPrefix = None | ||||
| for arg in sys.argv[1:]: | for arg in sys.argv[1:]: | ||||