summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCedric Bail <cedric@osg.samsung.com>2018-04-06 17:16:58 -0700
committerCedric BAIL <cedric@osg.samsung.com>2018-05-01 10:39:01 -0700
commitc0bcd3259189aa2f8d85b1cdd86b58d8ecfdaa25 (patch)
tree44375220902c82f22cda8bdf07f7111935a6de8f /src
parent135a39dd1470e438163888d7b46dec4192a4d445 (diff)
eina: allow EINA_VALUE_EMPTY to be propagated with eina_future_as_value.
Diffstat (limited to 'src')
-rw-r--r--src/lib/eina/eina_promise.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/eina/eina_promise.c b/src/lib/eina/eina_promise.c
index 5dac1c8443..3476a4b522 100644
--- a/src/lib/eina/eina_promise.c
+++ b/src/lib/eina/eina_promise.c
@@ -642,9 +642,9 @@ static Eina_Value
642_future_proxy(void *data, const Eina_Value v, 642_future_proxy(void *data, const Eina_Value v,
643 const Eina_Future *dead_future EINA_UNUSED) 643 const Eina_Future *dead_future EINA_UNUSED)
644{ 644{
645 Eina_Value copy; 645 Eina_Value copy = EINA_VALUE_EMPTY;
646 //We're in a safe context (from mainloop), so we can avoid scheduling a new dispatch 646 //We're in a safe context (from mainloop), so we can avoid scheduling a new dispatch
647 if (!v.type) copy = v; 647 if (!v.type || !memcmp(&v, &copy, sizeof (Eina_Value))) copy = v;
648 else if (!eina_value_copy(&v, &copy)) 648 else if (!eina_value_copy(&v, &copy))
649 { 649 {
650 ERR("Value cannot be copied - unusable with Eina_Future: %p (%s)", v.type, v.type->name); 650 ERR("Value cannot be copied - unusable with Eina_Future: %p (%s)", v.type, v.type->name);