Merge branch 'oscar/imps_2017'

[modules/gui.git] / src / SUIT / SUIT_ViewManager.cxx

diff --git a/src/SUIT/SUIT_ViewManager.cxx b/src/SUIT/SUIT_ViewManager.cxx
index b9e850cdf61d6c8a9d1ba6a0b7343b6f5d383d61..559c3258895029af6c8422668ed378b043829922 100755 (executable)
--- a/src/SUIT/SUIT_ViewManager.cxx
+++ b/src/SUIT/SUIT_ViewManager.cxx
@@ -58,8 +58,11 @@ SUIT_ViewManager::SUIT_ViewManager( SUIT_Study* theStudy,
 
   myId = useNewId( getType() );
 
-  connect( theDesktop, SIGNAL( windowActivated( SUIT_ViewWindow* ) ),
-           this,       SLOT( onWindowActivated( SUIT_ViewWindow* ) ) );
+  if( theDesktop )
+  {
+    connect( theDesktop, SIGNAL( windowActivated( SUIT_ViewWindow* ) ),
+             this,       SLOT( onWindowActivated( SUIT_ViewWindow* ) ) );
+  }
 
   myStudy = theStudy;
   if ( myStudy )