PyModalDialog: hideSplashScreen()

to deal with #487
NatronGitHub · May 12, 2020 · ec4b956 · ec4b956
1 parent 5fc28e1
commit ec4b956
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 26 deletions.
diff --git a/Gui/GuiAppInstance.cpp b/Gui/GuiAppInstance.cpp
@@ -443,8 +443,6 @@ GuiAppInstance::findAndTryLoadUntitledAutoSave()
                       "Would you like to restore it?\n"
                       "Clicking No will remove this auto-save.");
 
-    appPTR->hideSplashScreen();
-
     StandardButtonEnum ret = Dialogs::questionDialog(tr("Auto-save").toStdString(),
                                                      text.toStdString(), false, StandardButtons(eStandardButtonYes | eStandardButtonNo),
                                                      eStandardButtonYes);
@@ -611,9 +609,7 @@ GuiAppInstance::errorDialog(const std::string & title,
                             const std::string & message,
                             bool useHtml) const
 {
-    if ( appPTR->isSplashcreenVisible() ) {
-        appPTR->hideSplashScreen();
-    }
+    appPTR->hideSplashScreen();
     {
         QMutexLocker l(&_imp->_showingDialogMutex);
         ++_imp->_showingDialog;
@@ -634,9 +630,7 @@ GuiAppInstance::errorDialog(const std::string & title,
                             bool* stopAsking,
                             bool useHtml) const
 {
-    if ( appPTR->isSplashcreenVisible() ) {
-        appPTR->hideSplashScreen();
-    }
+    appPTR->hideSplashScreen();
     {
         QMutexLocker l(&_imp->_showingDialogMutex);
         ++_imp->_showingDialog;
@@ -656,9 +650,7 @@ GuiAppInstance::warningDialog(const std::string & title,
                               const std::string & message,
                               bool useHtml) const
 {
-    if ( appPTR->isSplashcreenVisible() ) {
-        appPTR->hideSplashScreen();
-    }
+    appPTR->hideSplashScreen();
     {
         QMutexLocker l(&_imp->_showingDialogMutex);
         ++_imp->_showingDialog;
@@ -679,9 +671,7 @@ GuiAppInstance::warningDialog(const std::string & title,
                               bool* stopAsking,
                               bool useHtml) const
 {
-    if ( appPTR->isSplashcreenVisible() ) {
-        appPTR->hideSplashScreen();
-    }
+    appPTR->hideSplashScreen();
     {
         QMutexLocker l(&_imp->_showingDialogMutex);
         ++_imp->_showingDialog;
@@ -701,9 +691,7 @@ GuiAppInstance::informationDialog(const std::string & title,
                                   const std::string & message,
                                   bool useHtml) const
 {
-    if ( appPTR->isSplashcreenVisible() ) {
-        appPTR->hideSplashScreen();
-    }
+    appPTR->hideSplashScreen();
     {
         QMutexLocker l(&_imp->_showingDialogMutex);
         ++_imp->_showingDialog;
@@ -724,9 +712,7 @@ GuiAppInstance::informationDialog(const std::string & title,
                                   bool* stopAsking,
                                   bool useHtml) const
 {
-    if ( appPTR->isSplashcreenVisible() ) {
-        appPTR->hideSplashScreen();
-    }
+    appPTR->hideSplashScreen();
     {
         QMutexLocker l(&_imp->_showingDialogMutex);
         ++_imp->_showingDialog;
@@ -748,9 +734,7 @@ GuiAppInstance::questionDialog(const std::string & title,
                                StandardButtons buttons,
                                StandardButtonEnum defaultButton) const
 {
-    if ( appPTR->isSplashcreenVisible() ) {
-        appPTR->hideSplashScreen();
-    }
+    appPTR->hideSplashScreen();
     {
         QMutexLocker l(&_imp->_showingDialogMutex);
         ++_imp->_showingDialog;
@@ -775,9 +759,7 @@ GuiAppInstance::questionDialog(const std::string & title,
                                StandardButtonEnum defaultButton,
                                bool* stopAsking)
 {
-    if ( appPTR->isSplashcreenVisible() ) {
-        appPTR->hideSplashScreen();
-    }
+    appPTR->hideSplashScreen();
     {
         QMutexLocker l(&_imp->_showingDialogMutex);
         ++_imp->_showingDialog;

diff --git a/Gui/GuiApplicationManager.cpp b/Gui/GuiApplicationManager.cpp
@@ -1090,6 +1090,7 @@ GuiApplicationManager::hideSplashScreen()
     boost_adaptbx::floating_point::exception_trapping trap(0);
 #endif
     if (_imp->_splashScreen) {
+        _imp->_splashScreen->hide();
         _imp->_splashScreen->close();
         delete _imp->_splashScreen;
         _imp->_splashScreen = 0;

diff --git a/Gui/PythonPanels.cpp b/Gui/PythonPanels.cpp
@@ -194,6 +194,8 @@ PyModalDialog::PyModalDialog(Gui* gui,
     , UserParamHolder()
     , _imp( new PyModalDialogPrivate(gui) )
 {
+    appPTR->hideSplashScreen();
+
     _imp->holder = new DialogParamHolder( QString(), gui->getApp(), this );
     setHolder(_imp->holder);
     _imp->holder->initializeKnobsPublic();