From ef6b02241a3f98c40ba6cb6dccd104f8af563a48 Mon Sep 17 00:00:00 2001 From: Suyeon Hwang Date: Thu, 23 Feb 2017 21:47:59 +0900 Subject: [PATCH] Fix finalize request routine Change-Id: I36d780c88aef71d06f8306b40564e21ca70fda6a Signed-off-by: Suyeon Hwang --- client/tts.c | 8 ++++---- server/ttsd_dbus.c | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) mode change 100644 => 100755 client/tts.c mode change 100644 => 100755 server/ttsd_dbus.c diff --git a/client/tts.c b/client/tts.c old mode 100644 new mode 100755 index 039512c..1caaf58 --- a/client/tts.c +++ b/client/tts.c @@ -288,7 +288,7 @@ int tts_destroy(tts_h tts) g_screen_reader = (bool)screen_reader; } if (!(false == g_screen_reader && TTS_MODE_SCREEN_READER == client->mode)) { - while (0 != ret) { + do { ret = tts_dbus_request_finalize(client->uid); if (0 != ret) { if (TTS_ERROR_TIMED_OUT != ret) { @@ -304,7 +304,7 @@ int tts_destroy(tts_h tts) } } } - } + } while (0 != ret); } else { SLOG(LOG_WARN, TAG_TTSC, "[WARNING] Do not request finalize : g_sr(%d) mode(%d)", g_screen_reader, client->mode); } @@ -689,7 +689,7 @@ int tts_unprepare(tts_h tts) } if (!(false == g_screen_reader && TTS_MODE_SCREEN_READER == client->mode)) { - while (0 != ret) { + do { ret = tts_dbus_request_finalize(client->uid); if (0 != ret) { if (TTS_ERROR_TIMED_OUT != ret) { @@ -705,7 +705,7 @@ int tts_unprepare(tts_h tts) } } } - } + } while (0 != ret); } else { SLOG(LOG_WARN, TAG_TTSC, "[WARNING] Do not request finalize : g_sr(%d) mode(%d)", g_screen_reader, client->mode); } diff --git a/server/ttsd_dbus.c b/server/ttsd_dbus.c old mode 100644 new mode 100755 index d8c9290..4b2ab38 --- a/server/ttsd_dbus.c +++ b/server/ttsd_dbus.c @@ -315,6 +315,7 @@ void __ttsd_dbus_connection_free() int ttsd_dbus_open_connection() { + SLOG(LOG_DEBUG, tts_tag(), "=== start dbus open connection"); DBusError err; dbus_error_init(&err); @@ -435,11 +436,13 @@ int ttsd_dbus_open_connection() return -1; } + SLOG(LOG_DEBUG, tts_tag(), "==="); return 0; } int ttsd_dbus_close_connection() { + SLOG(LOG_DEBUG, tts_tag(), "=== start dbus close connection"); DBusError err; dbus_error_init(&err); @@ -459,5 +462,7 @@ int ttsd_dbus_close_connection() __ttsd_dbus_connection_free(); __ttsd_dbus_service_free(); + SLOG(LOG_DEBUG, tts_tag(), "==="); + return 0; } -- 2.7.4