From 28ac974f16dcb860a6c2f2374424dc18177c8470 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Fri, 20 Jul 2012 10:08:08 +0000
Subject: [PATCH] fix OTHER segv in colorselector! the one cedric didn't find!

SVN revision: 74228
---
 legacy/elementary/src/lib/elm_colorselector.c | 58 ++++++++++---------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/legacy/elementary/src/lib/elm_colorselector.c b/legacy/elementary/src/lib/elm_colorselector.c
index 8a4278a559..7ccb84baff 100644
--- a/legacy/elementary/src/lib/elm_colorselector.c
+++ b/legacy/elementary/src/lib/elm_colorselector.c
@@ -709,23 +709,26 @@ _elm_colorselector_smart_theme(Evas_Object *obj)
      }
    for (i = 0; i < 4; i++)
      {
-        evas_object_del(sd->cb_data[i]->colorbar);
-        sd->cb_data[i]->colorbar = NULL;
-        evas_object_del(sd->cb_data[i]->bar);
-        sd->cb_data[i]->bar = NULL;
-        evas_object_del(sd->cb_data[i]->lbt);
-        sd->cb_data[i]->lbt = NULL;
-        evas_object_del(sd->cb_data[i]->rbt);
-        sd->cb_data[i]->rbt = NULL;
-        if (i != 0)
+        if (sd->cb_data[i])
           {
-             evas_object_del(sd->cb_data[i]->bg_rect);
-             sd->cb_data[i]->bg_rect = NULL;
+             evas_object_del(sd->cb_data[i]->colorbar);
+             sd->cb_data[i]->colorbar = NULL;
+             evas_object_del(sd->cb_data[i]->bar);
+             sd->cb_data[i]->bar = NULL;
+             evas_object_del(sd->cb_data[i]->lbt);
+             sd->cb_data[i]->lbt = NULL;
+             evas_object_del(sd->cb_data[i]->rbt);
+             sd->cb_data[i]->rbt = NULL;
+             if (i != 0)
+               {
+                  evas_object_del(sd->cb_data[i]->bg_rect);
+                  sd->cb_data[i]->bg_rect = NULL;
+               }
+             evas_object_del(sd->cb_data[i]->arrow);
+             sd->cb_data[i]->arrow = NULL;
+             evas_object_del(sd->cb_data[i]->touch_area);
+             sd->cb_data[i]->touch_area = NULL;
           }
-        evas_object_del(sd->cb_data[i]->arrow);
-        sd->cb_data[i]->arrow = NULL;
-        evas_object_del(sd->cb_data[i]->touch_area);
-        sd->cb_data[i]->touch_area = NULL;
      }
 
    _color_bars_add(obj);
@@ -784,13 +787,16 @@ _component_sizing_eval(Evas_Object *obj)
 
    for (i = 0; i < 4; i++)
      {
-        if (sd->cb_data[i]->bg_rect)
-          _sub_obj_size_hints_set(sd->cb_data[i]->bg_rect, 1, 1);
-
-        _sub_obj_size_hints_set(sd->cb_data[i]->bar, 1, 1);
-        _sub_obj_size_hints_set(sd->cb_data[i]->rbt, 1, 1);
-        _sub_obj_size_hints_set(sd->cb_data[i]->lbt, 1, 1);
-        _sub_obj_size_hints_set(sd->cb_data[i]->colorbar, 4, 1);
+        if (sd->cb_data[i])
+          {
+             if (sd->cb_data[i]->bg_rect)
+               _sub_obj_size_hints_set(sd->cb_data[i]->bg_rect, 1, 1);
+             
+             _sub_obj_size_hints_set(sd->cb_data[i]->bar, 1, 1);
+             _sub_obj_size_hints_set(sd->cb_data[i]->rbt, 1, 1);
+             _sub_obj_size_hints_set(sd->cb_data[i]->lbt, 1, 1);
+             _sub_obj_size_hints_set(sd->cb_data[i]->colorbar, 4, 1);
+          }
      }
 
    edje_object_size_min_restricted_calc
@@ -1176,13 +1182,9 @@ _elm_colorselector_smart_del(Evas_Object *obj)
 
    _items_del(sd);
    /* This cb_data are used during the destruction process of base.del */
-   for (i = 0; i < 4; i++)
-     tmp[i] = sd->cb_data[i];
-
+   for (i = 0; i < 4; i++) tmp[i] = sd->cb_data[i];
    ELM_WIDGET_CLASS(_elm_colorselector_parent_sc)->base.del(obj);
-
-   for (i = 0; i < 4; i++)
-     free(tmp[i]);
+   for (i = 0; i < 4; i++) free(tmp[i]);
 }
 
 static Eina_Bool