From 69fdb709ce521eb8f8156a537587bf2daf79b2df Mon Sep 17 00:00:00 2001 From: Bartlomiej Grzelewski Date: Wed, 16 Sep 2020 15:39:37 +0200 Subject: [PATCH] [AT-SPI] Prevent crashing Say method when s-r is turned off Change-Id: Iae4c20a1b8231b058c4db7f93aef0312e3bfa28d --- dali/internal/accessibility/bridge/bridge-impl.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dali/internal/accessibility/bridge/bridge-impl.cpp b/dali/internal/accessibility/bridge/bridge-impl.cpp index 4c0b0b1..4b30545 100644 --- a/dali/internal/accessibility/bridge/bridge-impl.cpp +++ b/dali/internal/accessibility/bridge/bridge-impl.cpp @@ -125,6 +125,11 @@ public: void Pause() override { + if (!IsUp()) + { + return; + } + auto r = directReadingClient.method< DBus::ValueOrError< void >( bool ) > ( "PauseResume" ).call( true ); if (!r) { @@ -134,6 +139,11 @@ public: void Resume() override { + if (!IsUp()) + { + return; + } + auto r = directReadingClient.method< DBus::ValueOrError< void >( bool ) > ( "PauseResume" ).call( false ); if (!r) { @@ -143,6 +153,11 @@ public: void Say( const std::string& text, bool discardable, std::function< void(std::string) > callback ) override { + if (!IsUp()) + { + return; + } + auto commandId = directReadingClient.method< DBus::ValueOrError< std::string, bool, int32_t >( std::string, bool ) > ( "ReadCommand" ).call( text, discardable ); if ( !commandId ) { -- 2.7.4