From: vsr <vsr@opencascade.com>
Date: Mon, 30 Nov 2015 14:23:45 +0000 (+0300)
Subject: Merge remote branch 'origin/hydro/imps_2015'
X-Git-Tag: V8_0_0a1~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ad6276bbf89c70b93ccef9a82800f18ff5578a00;p=modules%2Fgui.git

Merge remote branch 'origin/hydro/imps_2015'
---

ad6276bbf89c70b93ccef9a82800f18ff5578a00
diff --cc src/OCCViewer/OCCViewer_ViewWindow.cxx
index d8c9de76b,6dfe7d49d..8ad6be95c
--- a/src/OCCViewer/OCCViewer_ViewWindow.cxx
+++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx
@@@ -1179,8 -1146,10 +1179,10 @@@ void OCCViewer_ViewWindow::createAction
  {
    if( !toolMgr()->isEmpty() )
      return;
 -  
 +
    SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
+   if( !aResMgr )
+     return;
  
    QtxAction* aAction;