Fixes a crash when resetting config

dawleyj · Apr 3, 2023 · 11ad5fa · 11ad5fa
1 parent ccd7b05
commit 11ad5fa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/libraries/lib-numeric-formats/NumericConverterRegistry.cpp b/libraries/lib-numeric-formats/NumericConverterRegistry.cpp
@@ -89,7 +89,7 @@ void NumericConverterRegistry::Visit(const NumericConverterType& type, Visitor v
 {
  static Registry::OrderingPreferenceInitializer init {
  PathStart,
- { { L"", L"" } },
+ { { L"", L"parsedTime,beats,parsedFrequency,parsedBandwith" } },
  };
 
  RegistryVisitor registryVisitor { std::move(visitor), type };

diff --git a/libraries/lib-numeric-formats/formatters/ParsedNumericConverterFormatter.cpp b/libraries/lib-numeric-formats/formatters/ParsedNumericConverterFormatter.cpp
@@ -971,21 +971,21 @@ Registry::BaseItemPtr MakeGroup (
 }
 
 NumericConverterItemRegistrator parsedTime {
- Registry::Placement { {}, { Registry::OrderingHint::Begin } },
+ Registry::Placement { {}, {} },
  MakeGroup(
  "parsedTime", NumericConverterType_TIME, TimeConverterFormats_,
  WXSIZEOF(TimeConverterFormats_))
 };
 
 NumericConverterItemRegistrator parsedFrequency {
- Registry::Placement { {}, { Registry::OrderingHint::Begin } },
+ Registry::Placement { {}, {} },
  MakeGroup(
  "parsedFrequency", NumericConverterType_FREQUENCY,
  FrequencyConverterFormats_, WXSIZEOF(FrequencyConverterFormats_))
 };
 
 NumericConverterItemRegistrator parsedBandwith {
- Registry::Placement { {}, { Registry::OrderingHint::Begin } },
+ Registry::Placement { {}, {} },
  MakeGroup(
  "parsedBandwith", NumericConverterType_BANDWIDTH,
  BandwidthConverterFormats_, WXSIZEOF(BandwidthConverterFormats_))

diff --git a/libraries/lib-registries/Registry.cpp b/libraries/lib-registries/Registry.cpp
@@ -603,9 +603,12 @@ auto CollectedItems::MergeItems(
  force = true;
  }
  }
- else if ( iPass == OrderingHint::End && endItemsCount == 0 )
+ else if (iPass == OrderingHint::End && endItemsCount == 0)
+ {
+ assert(newSize >= prevSize || newSize == 0);
  // Remember the size before we put the ending items in place
  endItemsCount = newSize - prevSize;
+ }
 
  prevSize = newSize;
  }