From 6bd365b36b760071cd018d618124c8cd21db874f Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Mon, 18 Aug 2014 16:22:35 +0100 Subject: [PATCH] Fix assetion error in FocusManager Change-Id: I4bd833dd98802e44251191ddea51b8e38582d810 --- .../dali-toolkit/internal/focus-manager/focus-manager-impl.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/base/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp b/base/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp index dbf4146..8d90de6 100644 --- a/base/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp +++ b/base/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp @@ -338,7 +338,10 @@ bool FocusManager::DoSetCurrentFocusActor(const unsigned int actorID) if(mIsAccessibilityTtsEnabled) { Dali::SoundPlayer soundPlayer = Dali::SoundPlayer::Get(); - soundPlayer.PlaySound(FOCUS_SOUND_FILE); + if(soundPlayer) + { + soundPlayer.PlaySound(FOCUS_SOUND_FILE); + } // Play the accessibility attributes with the TTS player. Dali::TtsPlayer player = Dali::TtsPlayer::Get(Dali::TtsPlayer::SCREEN_READER); @@ -573,7 +576,10 @@ bool FocusManager::DoMoveFocus(FocusIDIter focusIDIter, bool forward, bool wrapp { // play sound & skip moving once Dali::SoundPlayer soundPlayer = Dali::SoundPlayer::Get(); - soundPlayer.PlaySound(FOCUS_CHAIN_END_SOUND_FILE); + if(soundPlayer) + { + soundPlayer.PlaySound(FOCUS_CHAIN_END_SOUND_FILE); + } mIsEndcapFeedbackPlayed = true; return true; -- 2.7.4