From 650baae06dbdd49285e82265e2cfc51db6ad7279 Mon Sep 17 00:00:00 2001 From: asv Date: Fri, 17 Jun 2005 06:05:05 +0000 Subject: [PATCH] fix for bug: "rename" can be called even when there is no active viewer. --- src/GEOMGUI/GeometryGUI.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index 667cf2eb0..26cdca2ae 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -287,12 +287,15 @@ void GeometryGUI::OnGUIEvent() void GeometryGUI::OnGUIEvent( int id ) { SUIT_Desktop* desk = application()->desktop(); - // check if current viewframe is of OCC type + + // check type of the active viewframe SUIT_ViewWindow* window = desk->activeWindow(); bool ViewOCC = ( window && window->getViewManager()->getType() == OCCViewer_Viewer::Type() ); bool ViewVTK = ( window && window->getViewManager()->getType() == VTKViewer_Viewer::Type() ); // if current viewframe is not of OCC and not of VTK type - return immediately - if( !ViewOCC && !ViewVTK ) + // fix for IPAL8958 - allow some commands to execute even when NO viewer is active (rename for example) + bool NotViewerDependentCommand = ( id == 901 ); + if ( !ViewOCC && !ViewVTK && !NotViewerDependentCommand ) return; // fix for IPAL9103, point 2 -- 2.39.2