Additional fix for "23641: [CEA] FIELDS Window not locked to panel" issue.

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 2a7d62cdcf2b48409511656863eff7888611a680..21cc6176ff1e14314251da8f9fd45e7d3b358ebb 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -1027,7 +1027,7 @@ void LightApp_Application::onOpenDoc()
   if ( aName.isNull() ) //Cancel
     return;
   
-  closeDoc();
+  closeDoc(false);
   onOpenDoc( aName );
   
   if ( !study ) // new study will be create in THIS application
@@ -5176,10 +5176,14 @@ bool LightApp_Application::checkExistingDoc( bool closeExistingDoc )
     if(answer == 0) {
       if ( activeStudy()->isSaved() ) {
         onSaveDoc();
-        closeDoc( false );
+               if (closeExistingDoc) {
+                       closeDoc(false);
+               }
       } else if ( onSaveAsDoc() ) {
-         if( !closeDoc( false ) ) {
-           result = false;
+         if (closeExistingDoc) {
+           if( !closeDoc( false ) ) {
+             result = false;
+           }
         }
       } else {
         result = false;