From cb8ebc044632e8ab82225a4e36e84f1f63cd6286 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 4 Sep 2019 09:38:17 +0200 Subject: [PATCH] Segfault --- companion/src/firmwares/eepromimportexport.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/companion/src/firmwares/eepromimportexport.h b/companion/src/firmwares/eepromimportexport.h index 21220160e..d325f00b8 100644 --- a/companion/src/firmwares/eepromimportexport.h +++ b/companion/src/firmwares/eepromimportexport.h @@ -769,7 +769,7 @@ class ConversionField: public TransformedField { void beforeExport() override { - _field = field / scale; + _field = scale ? field / scale : field; if (table) { if (!table->exportValue(_field, _field)) { @@ -809,7 +809,9 @@ class ConversionField: public TransformedField { field = importFunc(field); } - field *= scale; + if (scale) { + field *= scale; + } qCDebug(eepromImport) << QString("\timported ConversionField<%1>:").arg(internalField.getName()) << QString(" before: %1, after: %2").arg(_field).arg(field); } @@ -820,7 +822,7 @@ class ConversionField: public TransformedField { int _field = 0; ConversionTable * table = nullptr; int shift = 0; - int scale = 1; + int scale = 0; int min = INT_MIN; int max = INT_MAX; int (*exportFunc)(int) = nullptr;