diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2018-04-30 11:55:24 -0400 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2018-04-30 11:55:24 -0400 |
| commit | da0edb06b6259b3a13f68b644cc1cc86fe670dd0 (patch) | |
| tree | 98e77afb0538ff4265491f0d05bd48de7246e679 | |
| parent | 220df40cf4b970eb436ce4d771fc1197962475a0 (diff) | |
| download | sdl_ios-da0edb06b6259b3a13f68b644cc1cc86fe670dd0.tar.gz | |
Possible fix for cells not properly overwriting when in a bad system context
| -rw-r--r-- | SmartDeviceLink/SDLMenuManager.m | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/SmartDeviceLink/SDLMenuManager.m b/SmartDeviceLink/SDLMenuManager.m index d18fd4873..5523c76e5 100644 --- a/SmartDeviceLink/SDLMenuManager.m +++ b/SmartDeviceLink/SDLMenuManager.m @@ -55,6 +55,7 @@ NS_ASSUME_NONNULL_BEGIN @property (assign, nonatomic) UInt32 lastMenuId; @property (copy, nonatomic) NSArray<SDLMenuCell *> *oldMenuCells; +@property (copy, nonatomic) NSArray<SDLMenuCell *> *waitingUpdateMenuCells; @end @@ -125,7 +126,6 @@ UInt32 const MenuCellIdMin = 1; - (void)sdl_sendDeleteCurrentMenu:(SDLMenuUpdateCompletionHandler)completionHandler { if (self.oldMenuCells.count == 0) { completionHandler(nil); - return; } @@ -208,7 +208,7 @@ UInt32 const MenuCellIdMin = 1; || [self.currentHMILevel isEqualToEnum:SDLHMILevelNone] || [self.currentSystemContext isEqualToEnum:SDLSystemContextMenu]) { self.waitingOnHMIUpdate = YES; - _menuCells = menuCells; + self.waitingUpdateMenuCells = menuCells; return; } @@ -406,7 +406,7 @@ UInt32 const MenuCellIdMin = 1; if ([oldSystemContext isEqualToEnum:SDLSystemContextMenu] && ![self.currentSystemContext isEqualToEnum:SDLSystemContextMenu]) { if (self.waitingOnHMIUpdate) { - [self setMenuCells:_menuCells]; + [self setMenuCells:self.waitingUpdateMenuCells]; } } } |