fix genlist bug where queued items would be cleared before being realized if added...

SVN revision: 81789

diff --git a/ChangeLog b/ChangeLog
index 938f593df462f67d96e01fa2e98abb5e4644b176..d6187264a40bd859c75f10e881595cc71ad06a22 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -671,3 +671,6 @@
 
        * 1.7.4 release
 
+2012-12-28  Mike Blumenkrantz
+
+        * Fix bug where genlist would delete items added during selection callback if a clear was queued

diff --git a/NEWS b/NEWS
index 9654723b6ccaa9f1f69517d05cf971af7a7baaa6..53bd189a6763527c72cc88f3add0684981a68a6e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,16 @@ Elementary 1.7.4
 Changes since Elementary 1.7.3:
 -------------------------
 
+Fixes:
+
+   * Fix bug where genlist would delete items added during selection callback if a clear was queued
+
+
+Elementary 1.7.4
+
+Changes since Elementary 1.7.3:
+-------------------------
+
 Fixes:
 
    * Fix the naviframe title_set problem that caused the title visible status reset

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 3e0cde1080aa22dc6730eb49bb1315e73ebe0a5d..3ff683aa538ac9a1ce2716fe7294a0f8bf28f97d 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -4791,13 +4791,15 @@ _elm_genlist_clear(Evas_Object *obj,
      }
    sd->clear_me = EINA_FALSE;
    sd->pan_changed = EINA_TRUE;
-   if (sd->calc_job)
+   if (!sd->queue)
      {
-        ecore_job_del(sd->calc_job);
-        sd->calc_job = NULL;
+        if (sd->calc_job)
+          {
+             ecore_job_del(sd->calc_job);
+             sd->calc_job = NULL;
+          }
+        _clear(sd);
      }
-   if (sd->selected) sd->selected = eina_list_free(sd->selected);
-   _clear(sd);
    sd->pan_x = 0;
    sd->pan_y = 0;
    sd->minw = 0;