Fixed loading an organ when some configuration entry is out of range G…

…randOrgue#1696
oleg68 · Nov 14, 2023 · ae4f5f1 · ae4f5f1
1 parent a09673e
commit ae4f5f1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Fixed loading an organ when some configuration entry is out of range https://github.com/GrandOrgue/grandorgue/issues/1696
 - Fixed crash on closing an organ https://github.com/GrandOrgue/grandorgue/issues/1678
 # 3.13.1 (2023-11-05)
 - Fixed the maximal value of the "SYSEX Hauptwerk 32 Byte LCD" midi send events https://github.com/GrandOrgue/grandorgue/issues/1686

diff --git a/src/core/config/GOConfigReader.cpp b/src/core/config/GOConfigReader.cpp
@@ -374,16 +374,16 @@ int GOConfigReader::ReadInteger(
       value.c_str());
   }
 
-  if (nmin <= retval && retval <= nmax)
-    return retval;
-
-  wxString error;
-  error.Printf(
-    _("Out of range value at section '%s' entry '%s': %ld"),
-    group,
-    key,
-    retval);
-  throw error;
+  if (retval < nmin || retval > nmax) {
+    wxLogError(
+      _("Out of range value at section '%s' entry '%s': %ld. Assumed %d"),
+      group,
+      key,
+      retval,
+      defaultValue);
+    retval = defaultValue;
+  }
+  return retval;
 }
 
 int GOConfigReader::ReadLong(
@@ -455,16 +455,16 @@ double GOConfigReader::ReadFloat(
     throw error;
   }
 
-  if (nmin <= retval && retval <= nmax)
-    return retval;
-
-  wxString error;
-  error.Printf(
-    _("Out of range value at section '%s' entry '%s': %f"),
-    group.c_str(),
-    key.c_str(),
-    retval);
-  throw error;
+  if (retval < nmin || retval > nmax) {
+    wxLogError(
+      _("Out of range value at section '%s' entry '%s': %f. Assumed %f."),
+      group,
+      key,
+      retval,
+      defaultValue);
+    retval = defaultValue;
+  }
+  return retval;
 }
 
 unsigned GOConfigReader::ReadSize(