From b4efe20564c01511cda2aea08db049c03ee2b728 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Fri, 26 Feb 2016 10:34:18 -0800
Subject: [PATCH] Fix compiler warning

---
 src/MissionManager/MissionController.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc
index 02f79a56c9..ec77cc5785 100644
--- a/src/MissionManager/MissionController.cc
+++ b/src/MissionManager/MissionController.cc
@@ -353,7 +353,7 @@ bool MissionController::_loadJsonMissionFile(const QByteArray& bytes, QmlObjectL
 
             nextSequenceNumber++;
         }
-    } while (nextSimpleItemIndex < itemArray.count() | nextComplexItemIndex < complexItems->count());
+    } while (nextSimpleItemIndex < itemArray.count() || nextComplexItemIndex < complexItems->count());
 
     if (json.contains(_jsonPlannedHomePositionKey)) {
         SimpleMissionItem* item = new SimpleMissionItem(_activeVehicle, this);
-- 
GitLab