X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_MergeDlg.cxx;h=6bba06313aced59eb31f9ac401b664c94b0062f1;hb=560f8b2d0c2a7fdb4047f981cfac56ed3629bc1a;hp=2aba558af7aa5b6a827d67a863e8545462c1a3cf;hpb=9dd045b97c68174d7ce52d592b239c6a1769e464;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
index 2aba558af..6bba06313 100644
--- a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
@@ -462,9 +462,9 @@ void SMESHGUI_MergeDlg::Init()
   updateControls();
   
   if ( myAction == MERGE_NODES )
-    myHelpFileName = "merging_nodes_page.html";
+    myHelpFileName = "merging_nodes.html";
   else
-    myHelpFileName = "merging_elements_page.html";
+    myHelpFileName = "merging_elements.html";
 }
 
 //=================================================================================
@@ -511,7 +511,7 @@ void SMESHGUI_MergeDlg::FindGravityCenter(TColStd_MapOfInteger & theElemsIdMap,
 //=================================================================================
 bool SMESHGUI_MergeDlg::ClickOnApply()
 {
-  if (mySMESHGUI->isActiveStudyLocked() || myMesh->_is_nil())
+  if (SMESHGUI::isStudyLocked() || myMesh->_is_nil())
     return false;
 
   try {