Move the block of signals in common function to cover application exit also.

diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index 62ebe07bbc3e672122a4896ba4d3f6077e7e137a..34ca54087d2ac66e03d973fbbe3f099e3f13e427 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -678,10 +678,7 @@ void SalomeApp_Application::onCloseDoc( bool ask )
 
     }
   }
-  bool isBlocked = desktop()->signalsBlocked();
-  desktop()->blockSignals( true );
   LightApp_Application::onCloseDoc( ask );
-  desktop()->blockSignals( isBlocked );
 }
 
 /*!Sets enable or disable some actions on selection changed.*/

diff --git a/src/SalomeApp/SalomeApp_Study.cxx b/src/SalomeApp/SalomeApp_Study.cxx
index b83431fa04af01890d8600ab013da2b84b95a623..2934889368ae8446a0f7c327f85641c628322024 100644 (file)
--- a/src/SalomeApp/SalomeApp_Study.cxx
+++ b/src/SalomeApp/SalomeApp_Study.cxx
@@ -734,7 +734,11 @@ void SalomeApp_Study::closeDocument(bool permanently)
     if ( myObserver )
       myStudyDS->detach( myObserver->_this() );
     if ( permanently ) {
+      SUIT_Desktop* desk = SUIT_Session::session()->activeApplication()->desktop();
+      bool isBlocked = desk->signalsBlocked();
+      desk->blockSignals( true );
       SalomeApp_Application::studyMgr()->Close( studyPtr );
+      desk->blockSignals( isBlocked );
 #ifndef DISABLE_PYCONSOLE
       SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( application() );
       if( app->pythonConsole() )