From cc0ab26f5d6f3359cb339b5bdad0220163735ce5 Mon Sep 17 00:00:00 2001
From: Randy Mackay <rmackay9@yahoo.com>
Date: Thu, 16 Jul 2015 14:12:26 +0900
Subject: [PATCH] Mount: fix init of mode

Mode was being set from MNT_DEFTL_MODE parameter before that parameter's
value had been initialised from eeprom
---
 libraries/AP_Mount/AP_Mount.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/AP_Mount/AP_Mount.cpp b/libraries/AP_Mount/AP_Mount.cpp
index 5a39ec08b2..27987656c7 100644
--- a/libraries/AP_Mount/AP_Mount.cpp
+++ b/libraries/AP_Mount/AP_Mount.cpp
@@ -471,7 +471,6 @@ AP_Mount::AP_Mount(const AP_AHRS_TYPE &ahrs, const struct Location &current_loc)
     // initialise backend pointers and mode
     for (uint8_t i=0; i<AP_MOUNT_MAX_INSTANCES; i++) {
         _backends[i] = NULL;
-        state[i]._mode = (enum MAV_MOUNT_MODE)state[i]._default_mode.get();
     }
 }
 
@@ -497,6 +496,9 @@ void AP_Mount::init(const AP_SerialManager& serial_manager)
 
     // create each instance
     for (uint8_t instance=0; instance<AP_MOUNT_MAX_INSTANCES; instance++) {
+        // default instance's state
+        state[instance]._mode = (enum MAV_MOUNT_MODE)state[instance]._default_mode.get();
+
         MountType mount_type = get_mount_type(instance);
 
         // check for servo mounts