From f5b9ebfcc3fad4c5d928b841b7e5e4622aacce5d Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Wed, 26 Feb 2014 09:54:25 +0100
Subject: [PATCH] Core in import of EEPROMS < 216

---
 companion/src/eepromimportexport.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/companion/src/eepromimportexport.h b/companion/src/eepromimportexport.h
index 91eda318c..5ea132e61 100644
--- a/companion/src/eepromimportexport.h
+++ b/companion/src/eepromimportexport.h
@@ -650,12 +650,14 @@ class ConversionField: public TransformedField {
         if (!error.isEmpty())
           EEPROMWarnings += error + "\n";
       }
-      else if (shift) {
+
+      if (shift) {
         if (val < min) _field = min + shift;
         else if (val > max) _field = max + shift;
         else _field = val + shift;
       }
-      else {
+
+      if (exportFunc) {
         _field = exportFunc(val);
       }
     }
@@ -666,10 +668,12 @@ class ConversionField: public TransformedField {
         if (table->importValue(_field, field))
           return;
       }
-      else if (shift) {
+
+      if (shift) {
         field = _field - shift;
       }
-      else {
+
+      if (importFunc) {
         field = importFunc(_field);
       }