Merge branch 'tizen_4.0' into tizen_5.0

Change-Id: Ic5b2736ab945e3c39cea6f32aae8d5532dd74558

diff --git a/src/common/task-queue.cpp b/src/common/task-queue.cpp
index fe551a5..c743a78 100644 (file)
--- a/src/common/task-queue.cpp
+++ b/src/common/task-queue.cpp
@@ -71,7 +71,11 @@ void TaskQueue::Stop() {
 void TaskQueue::ScheduleWorkInMainThread(const std::function<void()>& work) {
   QueueData<void>* d = new QueueData<void>();
   d->work_callback_ = work;
-  g_idle_add(WorkCallback<void>, d);
+
+  if (!g_idle_add(WorkCallback<void>, d)) {
+    LoggerE("g_idle_add failed");
+    delete d;
+  }
 }
 
 }  // namespace common

diff --git a/src/common/task-queue.h b/src/common/task-queue.h
index c44cc09..1fe8879 100644 (file)
--- a/src/common/task-queue.h
+++ b/src/common/task-queue.h
@@ -188,7 +188,11 @@ void TaskQueue::ScheduleWorkInMainThread(const std::function<void(const std::sha
   QueueData<T>* d = new QueueData<T>();
   d->work_callback_ = work;
   d->data_ = data;
-  g_idle_add(WorkCallback<T>, d);
+
+  if (!g_idle_add(WorkCallback<T>, d)) {
+    LoggerE("g_idle_add failed");
+    delete d;
+  }
 }
 
 }  // namespace common