From: vsr <vsr@opencascade.com>
Date: Wed, 24 Jun 2015 15:58:18 +0000 (+0300)
Subject: From NewGEOM: activation of SMESH after any module without object browser crashes... 
X-Git-Tag: V7_7_0a1~28
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0b23204715a4f21c0cbafb21343027d5fc88dc19;p=modules%2Fgui.git

From NewGEOM: activation of SMESH after any module without object browser crashes application
---

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 0f580e8d5..ab27384ed 100644
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -512,8 +512,9 @@ bool LightApp_Application::activateModule( const QString& modName )
   updateWindows();
   updateViewManagers();
 
-  if ( activeStudy() && activeStudy()->root() && objectBrowser() && objectBrowser()->root() != activeStudy()->root() ) {
-    objectBrowser()->setRoot( activeStudy()->root() );
+  if ( activeStudy() && activeStudy()->root() && objectBrowser() ) {
+    if ( objectBrowser()->root() != activeStudy()->root() ) 
+      objectBrowser()->setRoot( activeStudy()->root() );
     updateObjectBrowser( true );
   }
   return true;