summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Fischer <joeljfischer@gmail.com>2020-03-16 15:16:19 -0400
committerJoel Fischer <joeljfischer@gmail.com>2020-03-16 15:16:19 -0400
commit9d0df30478189ea83b66de6f559c9e46dbd47393 (patch)
tree4914b83594b3c0e068607b2f75491311604bcf12
parent4c996b061df618c014fc6816b3269877aa414ba5 (diff)
downloadsdl_ios-bugfix/issue-1536-empty-displaycapabilities-workaround.tar.gz
Fix perform interactions not workingbugfix/issue-1536-empty-displaycapabilities-workaround
* Reset the HMILevel when the ChoiceSetManager is reset
-rw-r--r--SmartDeviceLink/SDLChoiceSetManager.m7
1 files changed, 2 insertions, 5 deletions
diff --git a/SmartDeviceLink/SDLChoiceSetManager.m b/SmartDeviceLink/SDLChoiceSetManager.m
index 2b7c597c3..a3f658b6c 100644
--- a/SmartDeviceLink/SDLChoiceSetManager.m
+++ b/SmartDeviceLink/SDLChoiceSetManager.m
@@ -160,7 +160,7 @@ UInt16 const ChoiceCellCancelIdMin = 1;
#pragma mark - State Management
- (void)didEnterStateShutdown {
- _currentHMILevel = nil;
+ _currentHMILevel = SDLHMILevelNone;
[self.transactionQueue cancelAllOperations];
self.transactionQueue = [self sdl_newTransactionQueue];
@@ -494,10 +494,7 @@ UInt16 const ChoiceCellCancelIdMin = 1;
- (void)sdl_hmiStatusNotification:(SDLRPCNotificationNotification *)notification {
// We can only present a choice set if we're in FULL
SDLOnHMIStatus *hmiStatus = (SDLOnHMIStatus *)notification.notification;
-
- if (hmiStatus.windowID != nil && hmiStatus.windowID.integerValue != SDLPredefinedWindowsDefaultWindow) {
- return;
- }
+ if (hmiStatus.windowID != nil && hmiStatus.windowID.integerValue != SDLPredefinedWindowsDefaultWindow) { return; }
self.currentHMILevel = hmiStatus.hmiLevel;