From 74cee19c09dd88499256b39f83874a7796203dfb Mon Sep 17 00:00:00 2001
From: krzys-h <krzys_h@interia.pl>
Date: Wed, 9 Sep 2015 20:32:56 +0200
Subject: [PATCH] Fixed objects being deselected if not clicked on any object

---
 src/level/robotmain.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp
index 8f5f1bbd..c007ed34 100644
--- a/src/level/robotmain.cpp
+++ b/src/level/robotmain.cpp
@@ -1820,10 +1820,10 @@ bool CRobotMain::SelectObject(CObject* obj, bool displayError)
     if (m_movie->IsExist()) return false;
     if (obj != nullptr && !IsSelectable(obj)) return false;
 
-    CObject* prev = DeselectAll();
-
     if (m_missionType == MISSION_CODE_BATTLE && m_codeBattleStarted)
     {
+        DeselectAll();
+
         // During code battles, only change camera
         m_camera->SetControllingObject(obj);
         if (obj != nullptr)
@@ -1838,6 +1838,7 @@ bool CRobotMain::SelectObject(CObject* obj, bool displayError)
     else
     {
         if (obj == nullptr) return false;
+        CObject* prev = DeselectAll();
 
         if (prev != nullptr && prev != obj)
            PushToSelectionHistory(prev);