Index: trunk/Cosy/main/MCosy.cc
===================================================================
--- trunk/Cosy/main/MCosy.cc	(revision 14593)
+++ trunk/Cosy/main/MCosy.cc	(revision 16763)
@@ -32,4 +32,5 @@
 //#define EXPERT
 #undef EXPERT
+#define FACT
 
 /*
@@ -882,4 +883,5 @@
     armed &= fMac2 && fMac2->IsArmed();
 
+#ifndef FACT  // FIXME: Maybe this is also correct for magic?
     if (fMac1 && fMac2)
     {
@@ -890,4 +892,15 @@
             SetStatus(MDriveCom::kTracking);
     }
+#else
+    if (fMac1 && fMac2)
+    {
+        // Handle remote control introduced state changed
+        // FIXME: Use a bit in the PD3 to signal remote control operation!
+        if (fStatus==MDriveCom::kStopped && (fMac1->IsPositioning() || fMac2->IsPositioning()))
+            SetStatus(MDriveCom::kMoving);
+        if (fStatus==MDriveCom::kMoving  && !fMac1->IsPositioning() && !fMac2->IsPositioning())
+            SetStatus(MDriveCom::kStopped);
+    }
+#endif
 
     if (HasError())
@@ -1062,5 +1075,7 @@
 
     fCom = com;//new MDriveCom(this, addr, tx, rx, fOutRep);
+#ifndef FACT
     fCom->SetOutRep(fOutRep);
+#endif
     //    fCom->Start();
 }