From e56dbfdb2424612a3d2ed485b4779f4ace91d9e8 Mon Sep 17 00:00:00 2001 From: James Cotton Date: Thu, 11 Aug 2011 11:02:12 -0500 Subject: [PATCH] CameraStabilization: Bad memory error that Sambas caught --- .../src/plugins/config/configcamerastabilizationwidget.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp b/ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp index 3d7ffb082..afbdae760 100644 --- a/ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp @@ -121,7 +121,8 @@ void ConfigCameraStabilizationWidget::applySettings() // Channel 1 is second entry, so becomes zero int mixerNum = selectors[i]->currentIndex() - 1; - if ( *mixerTypes[mixerNum] != MixerSettings::MIXER1TYPE_DISABLED && + if ( mixerNum >= 0 && // Short circuit in case of none + *mixerTypes[mixerNum] != MixerSettings::MIXER1TYPE_DISABLED && (*mixerTypes[mixerNum] != MixerSettings::MIXER1TYPE_CAMERAROLL + i) ) { // If the mixer channel already to something that isn't what we are // about to set it to reset to none