From: eap <eap@opencascade.com>
Date: Wed, 30 Nov 2011 14:12:02 +0000 (+0000)
Subject: 0021436: EDF 1810 SMESH: Create a segment and adding it to a group causes Salome... 
X-Git-Tag: V6_4_0rc2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=45fc0eb209f2a8118f91c09480c44451dca1aea4;p=modules%2Fgui.git

0021436: EDF 1810 SMESH: Create a segment and adding it to a group causes Salome to crash
    Prevent clasing BusyLocker with BusyLocker from SMESH
+namespace
+{
 class BusyLocker
---

diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx
index 7993d9f94..8aa677e3c 100755
--- a/src/CAM/CAM_Application.cxx
+++ b/src/CAM/CAM_Application.cxx
@@ -45,6 +45,8 @@
 
 #include <cstdio>
 
+namespace
+{
 class BusyLocker
 {
 public:
@@ -54,6 +56,7 @@ private:
   bool  myPrev;
   bool& myBusy;
 };
+}
 
 /*!
   \brief Create new instance of CAM_Application.
@@ -361,10 +364,10 @@ CAM_Module* CAM_Application::loadModule( const QString& modName, const bool show
   if(version) {    
     for ( ModuleInfoList::iterator it = myInfoList.begin(); it != myInfoList.end(); ++it ) {
       if ( (*it).title == modName ) {
-	if( (*it).version.isEmpty() ) {
-	  (*it).version = QString(version);
-	}
-	break;
+        if( (*it).version.isEmpty() ) {
+          (*it).version = QString(version);
+        }
+        break;
       }
     }
   }