From 169577954daf20c021d8facef25fe33a15d8e6b1 Mon Sep 17 00:00:00 2001
From: rnv <rnv@opencascade.com>
Date: Mon, 4 Feb 2019 16:23:05 +0300
Subject: [PATCH] Additional fix for "23641: [CEA] FIELDS Window not locked to
 panel" issue.

---
 src/LightApp/LightApp_Application.cxx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 2a7d62cdc..21cc6176f 100644
--- 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;
-- 
2.30.2