Fix widgets recreation on app mode change

osmandapp · Oct 6, 2023 · b320abd · b320abd
1 parent ca34397
commit b320abd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Sources/Controllers/Map/OAMapHudViewController.mm b/Sources/Controllers/Map/OAMapHudViewController.mm
@@ -696,6 +696,7 @@ - (void) onApplicationModeChanged:(OAApplicationMode *)prevMode
 {
     dispatch_async(dispatch_get_main_queue(), ^{
         [self updateColors];
+        [self recreateAllControls];
     });
 }
 

diff --git a/Sources/Controllers/Map/Widgets/OAMapWidgetRegistry.mm b/Sources/Controllers/Map/Widgets/OAMapWidgetRegistry.mm
@@ -25,6 +25,7 @@ @implementation OAMapWidgetRegistry
 {
     NSMutableDictionary<OAWidgetsPanel *, NSMutableOrderedSet<OAMapWidgetInfo *> *> *_allWidgets;
     OAAppSettings *_settings;
+    OAApplicationMode *_cachedAppMode;
 }
 
 + (OAMapWidgetRegistry *)sharedInstance
@@ -322,10 +323,15 @@ - (void) reorderWidgets:(NSArray<OAMapWidgetInfo *> *)widgetInfos
                                                         panels:(NSArray<OAWidgetsPanel *> *)panels
 {
     NSMutableArray<OAMapWidgetInfo *> *widgetInfos = [NSMutableArray array];
-    if (_settings.applicationMode.get == appMode)
+    if (_cachedAppMode == appMode)
+    {
         [widgetInfos addObjectsFromArray:self.getAllWidgets];
+    }
     else
+    {
+        _cachedAppMode = appMode;
         [widgetInfos addObjectsFromArray:[OAWidgetsInitializer createAllControlsWithAppMode:appMode]];
+    }
     NSMutableOrderedSet<OAMapWidgetInfo *> *filteredWidgets = [NSMutableOrderedSet orderedSet];
     for (OAMapWidgetInfo *widget in widgetInfos)
     {