Merge pull request #1132 from mlyle/mpl-dumbaudio

vtxconfig: unconditionally init VTXSettings
d-ronin · Jul 20, 2016 · d6550c8 · d6550c8
2 parents 65a6d5b + 6f7cf8d
commit d6550c8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/flight/Modules/VTXConfig/VTXConfig.c b/flight/Modules/VTXConfig/VTXConfig.c
@@ -187,9 +187,10 @@ int32_t VTXConfigInitialize(void)
 		module_enabled = false;
 	}
 
+	VTXSettingsInitialize();
+
 	if (module_enabled) {
 		VTXInfoInitialize();
-		VTXSettingsInitialize();
 		VTXSettingsConnectCallbackCtx(UAVObjCbSetFlag, &settings_updated);
 	}
 
@@ -301,8 +302,7 @@ static void vtxConfigTask(void *parameters)
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			// Cycle through different baud rates. The spec says 4.8kbps, but it can deviate
 			if (baud_rate < TBS_MAX_BAUD) {
 				baud_rate += 50;