From: eap <eap@opencascade.com>
Date: Fri, 2 Mar 2018 19:08:10 +0000 (+0300)
Subject: GPUSPHGUI: fix errors relating to eCustomControl
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d55b2b4d3f8fe626cdde21050a60a76d814b1621;p=modules%2Fsmesh.git

GPUSPHGUI: fix errors relating to eCustomControl
---

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index cefb6fc14..9e2ad2b31 100644
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -1670,7 +1670,9 @@ namespace
     ActionControl.Bind( SMESHOp::OpOverConstrainedVolume, SMESH_Actor::eOverConstrainedVolume );
     ActionControl.Bind( SMESHOp::OpEqualVolume,           SMESH_Actor::eCoincidentElems3D );
 
-    return theReversed ? ActionControl.Find2( theID ) : ActionControl.Find1( theID );
+    if ( theReversed )
+      return ActionControl.IsBound2( theID ) ? ActionControl.Find2( theID ) : 0;
+    return   ActionControl.IsBound1( theID ) ? ActionControl.Find1( theID ) : 0;
   }
 
   void Control( int theCommandID )
diff --git a/src/SMESHGUI/SMESHGUI_Selection.cxx b/src/SMESHGUI/SMESHGUI_Selection.cxx
index ce969aea5..7a39a5e2f 100644
--- a/src/SMESHGUI/SMESHGUI_Selection.cxx
+++ b/src/SMESHGUI/SMESHGUI_Selection.cxx
@@ -362,6 +362,7 @@ QString SMESHGUI_Selection::controlMode( int ind ) const
     case SMESH_Actor::eCoincidentElems1D:     mode = "eCoincidentElems1D";     break;
     case SMESH_Actor::eCoincidentElems2D:     mode = "eCoincidentElems2D";     break;
     case SMESH_Actor::eCoincidentElems3D:     mode = "eCoincidentElems3D";     break;
+    case SMESH_Actor::eCustomControl:         mode = "eCustomControl";         break;
     default:break;
     }
   }