summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Melnik <amelnik@luxoft.com>2014-07-18 10:54:06 +0300
committerAndrey Melnik <amelnik@luxoft.com>2014-07-18 10:56:51 +0300
commit72666d850ef88f8ab960f0db552f255dd77547c5 (patch)
treeb6bbf7722cbf9999be30ba470e53f2288abae22b
parent362d06946b15311f61ef32d1d40572cb8e4dbce8 (diff)
downloadsdl_core-72666d850ef88f8ab960f0db552f255dd77547c5.tar.gz
APPLINK-6533: Speak pop-up managed by HMI while to PerformInteraction
-rw-r--r--src/components/HMI/app/controller/sdl/Controller.js8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/components/HMI/app/controller/sdl/Controller.js b/src/components/HMI/app/controller/sdl/Controller.js
index a702114429..7921b58523 100644
--- a/src/components/HMI/app/controller/sdl/Controller.js
+++ b/src/components/HMI/app/controller/sdl/Controller.js
@@ -413,6 +413,10 @@ SDL.SDLController = Em.Object
SDL.SDLModel.set('interactionData.vrHelp', null);
SDL.SDLController.getApplicationModel(appID).activeRequests.uiPerformInteraction = null;
+
+ if (SDL.TTSPopUp.active && FFW.TTS.requestId == null) {
+ SDL.TTSPopUp.DeactivateTTS();
+ }
},
/**
* Method to sent notification ABORTED for VR PerformInteraction
@@ -426,6 +430,10 @@ SDL.SDLController = Em.Object
SDL.SDLModel.set('VRActive', false);
SDL.InteractionChoicesView.timerUpdate();
+
+ if (choiceID && SDL.TTSPopUp.active && FFW.TTS.requestId == null) {
+ SDL.TTSPopUp.DeactivateTTS();
+ }
},
/**
* Method to sent notification for Alert