From: Paul RASCLE <paul.rascle@edf.fr>
Date: Mon, 1 Feb 2016 10:37:45 +0000 (+0100)
Subject: Merge branch 'V7_7_BR' into hydro/imps_2015
X-Git-Tag: V8_2_0a1~6^2~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8dc06f253c1d6a0bb3cc999842fa5a7848c79f40;p=modules%2Fgui.git

Merge branch 'V7_7_BR' into hydro/imps_2015
---

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