Index: /trunk/FACT++/src/fadctrl.cc
===================================================================
--- /trunk/FACT++/src/fadctrl.cc	(revision 11159)
+++ /trunk/FACT++/src/fadctrl.cc	(revision 11160)
@@ -1230,4 +1230,6 @@
                     stat1[idx] = 0;
                     nclosed1++;
+
+                    DisconnectSlot(idx);
                 }
                 if (c->IsConnecting())
@@ -1379,10 +1381,14 @@
             (boost::bind(&StateMachineFAD::CmdEnable, this, _1, FAD::kCmdDwrite))
             ("Set Dwrite (possibly high / always low)");
+        T::AddEvent("ENABLE_CONTINOUS_TRIGGER", "B:1")
+            (boost::bind(&StateMachineFAD::CmdEnable, this, _1, FAD::kCmdContTrigger))
+            ("Enable continous (internal) trigger.");
+        T::AddEvent("ENABLE_TRIGGER_LINE", "B:1")
+            (boost::bind(&StateMachineFAD::CmdEnable, this, _1, FAD::kCmdTriggerLine))
+            ("Incoming triggers can be accepted/will not be accepted");
         T::AddEvent("SET_DEBUG_MODE", "B:1")
             (boost::bind(&StateMachineFAD::CmdEnable, this, _1, FAD::kCmdSocket))
             ("Set debug mode (yes: dump events through command socket, no=dump events through other sockets)");
-        T::AddEvent("ENABLE_TRIGGER_LINE", "B:1")
-            (boost::bind(&StateMachineFAD::CmdEnable, this, _1, FAD::kCmdTriggerLine))
-            ("Incoming triggers can be accepted/will not be accepted");
+
         T::AddEvent("SET_TRIGGER_RATE", "I:1")
             (boost::bind(&StateMachineFAD::SetTriggerRate, this, _1))
@@ -1404,11 +1410,4 @@
             ("Adjust ADC phase (in 'steps')");
 
-        T::AddEvent("CONTINOUS_TRIGGER_ON")
-            (boost::bind(&StateMachineFAD::Cmd, this, FAD::kCmdContTriggerOn))
-            ("");
-        T::AddEvent("CONTINOUS_TRIGGER_OFF")
-            (boost::bind(&StateMachineFAD::Cmd, this, FAD::kCmdContTriggerOff))
-            ("");
-
         T::AddEvent("RESET_TRIGGER_ID")
             (boost::bind(&StateMachineFAD::Cmd, this, FAD::kCmdResetTriggerId))