diff --git a/python/shotgun_desktop/splash.py b/python/shotgun_desktop/splash.py index 4bef3f54..35818dcf 100644 --- a/python/shotgun_desktop/splash.py +++ b/python/shotgun_desktop/splash.py @@ -22,7 +22,7 @@ def __init__(self, parent=None): """ Constructor. Widget is initially hidden. """ - QtGui.QDialog.__init__(self, parent) + super().__init__(parent) self.ui = splash.Ui_Splash() self.ui.setupUi(self) @@ -50,7 +50,7 @@ def show(self): """ Shows the dialog of top of all other dialogs. """ - QtGui.QDialog.show(self) + super().show() self.raise_() self.activateWindow() @@ -61,4 +61,4 @@ def hide(self): # There's no sense showing the previous message when we show the # splash next time. self.set_message("") - QtGui.QDialog.hide(self) + super().hide() diff --git a/python/shotgun_desktop/startup.py b/python/shotgun_desktop/startup.py index 87016494..e009dacc 100644 --- a/python/shotgun_desktop/startup.py +++ b/python/shotgun_desktop/startup.py @@ -321,8 +321,6 @@ def __restart_app_with_countdown(splash, reason): # splash screen that from the user point of view looks like the app is redoing work # it already did by mistake. This makes the behavior explicit. splash.show() - splash.raise_() - splash.activateWindow() for i in range(3, 0, -1): splash.set_message("%s Restarting in %d seconds..." % (reason, i)) time.sleep(1) @@ -877,6 +875,9 @@ def main(**kwargs): else: splash.set_version(app_bootstrap.get_version()) + splash.set_message("Loading the application...") + splash.show() + # We might crash before even initializing the authenticator, so instantiate # it right away. shotgun_authenticator = None