--- a/examples/DS401_Slave_Gui/TestSlaveGui.cpp	Sun Sep 30 22:38:58 2007 +0200
+++ b/examples/DS401_Slave_Gui/TestSlaveGui.cpp	Sun Sep 30 22:41:12 2007 +0200
@@ -58,22 +58,6 @@
 extern wxTextCtrl 	*textLog;
 extern int			node_id_ext;
 
-UNS32 OnMasterMap1Update(CO_Data* d, const indextable * unsused_indextable, UNS8 unsused_bSubindex)
-{
-	return 0;
-}
-
-s_BOARD MasterBoard = {"1", "125K"};
-
-#if !defined(WIN32) || defined(__CYGWIN__)
-void catch_signal(int sig)
-{
-  signal(SIGTERM, catch_signal);
-  signal(SIGINT, catch_signal);
-  printf("Got Signal %d\n",sig);
-}
-#endif
-
 //***************************  INIT  *****************************************
 void InitNodes(CO_Data* d, UNS32 id)
 {
@@ -91,11 +75,6 @@
 {
   printf("Bus name: %s        Freq: %s       Driver: %s\n", SlaveBoard.busname, SlaveBoard.baudrate, LibraryPath);
 
-  #if !defined(WIN32) || defined(__CYGWIN__)
-	signal(SIGTERM, catch_signal);
-	signal(SIGINT, catch_signal);
-  #endif
-
   #ifndef NOT_USE_DYNAMIC_LOADING
 	LoadCanDriver(LibraryPath);
   #endif		
@@ -115,19 +94,21 @@
 		printf("Cannot open Slave Board (%s,%s)\n",SlaveBoard.busname, SlaveBoard.baudrate);
 		return (1);
 	  }
-	// Start timer thread
-	//printf("nodeid slave=%x\n",node_id_ext);
+
 	StartTimerLoop(&InitNodes);
+
 	return 0;
 }
 
 void stop_slave()
 {	
-	StopTimerLoop();
-	// Close CAN devices (and can threads)
-	// Stop master
+    EnterMutex();
+
 	setState(&ObjDict_Data, Stopped);
-	//canClose(&ObjDict_Data);
-	//canClose(&TestMaster_Data);
+    StopTimerLoop();
+    canClose(&ObjDict_Data);
+
+    LeaveMutex();
+
 	return;
 }