Salome HOME
projects
/
modules
/
gui.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
77a9b7a
0432d66
)
Merge remote branch 'origin/hydro/imps_2015'
author
vsr
<vsr@opencascade.com>
Mon, 30 Nov 2015 14:23:45 +0000
(17:23 +0300)
committer
vsr
<vsr@opencascade.com>
Mon, 30 Nov 2015 14:23:45 +0000
(17:23 +0300)
1
2
src/OCCViewer/OCCViewer_ViewWindow.cxx
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/OCCViewer/OCCViewer_ViewWindow.cxx
index d8c9de76b9038ed1903af7e307cb775b3c36bb33,6dfe7d49d40703dc95f62e994efac12a280c407f..8ad6be95c8e4e742427b3ab5a6523c3c6fc3dca8
---
1
/
src/OCCViewer/OCCViewer_ViewWindow.cxx
---
2
/
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;