From 0bff05f0958cf9ca0d9ad772710f95473092ac6d Mon Sep 17 00:00:00 2001
From: krzys-h <krzys_h@interia.pl>
Date: Mon, 17 Aug 2015 18:26:09 +0200
Subject: [PATCH] Fixed problems with motor() + fire() in CBot while the robot
 was selected

---
 src/object/old_object.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/object/old_object.cpp b/src/object/old_object.cpp
index 6e7abc95..a164136e 100644
--- a/src/object/old_object.cpp
+++ b/src/object/old_object.cpp
@@ -2030,14 +2030,14 @@ bool COldObject::EventProcess(const Event &event)
         else if (GetSelect())
         {
             bool canMove = true;
-            if (Implements(ObjectInterfaceType::Programmable))
-            {
-                canMove = canMove && !IsProgram();
-            }
             if (Implements(ObjectInterfaceType::TaskExecutor))
             {
                 canMove = canMove || (IsForegroundTask() && GetForegroundTask()->IsPilot());
             }
+            if (Implements(ObjectInterfaceType::Programmable))
+            {
+                canMove = canMove && !IsProgram();
+            }
 
             if ( canMove )
             {