3 files changed, 21 insertions, 15 deletions

diff --git a/src/bin/playbacks_view.c b/src/bin/playbacks_view.c
index 9455e5a..b938454 100644
--- a/src/bin/playbacks_view.c
+++ b/src/bin/playbacks_view.c
@@ -48,13 +48,15 @@ _sink_input_removed_cb(void *data, int type EINA_UNUSED,
    struct Playbacks_View *pv = data;
    Emix_Sink_Input *ev = info;
    Elm_Object_Item *item = elm_genlist_first_item_get(pv->genlist);
-   if (ev == elm_object_item_data_get(item))
-     elm_object_item_del(item);
 
-   while ((item = elm_genlist_item_next_get(item)))
+   if (item)
      {
-        if (ev == elm_object_item_data_get(item))
-          elm_object_item_del(item);
+        do
+          {
+             if (ev == elm_object_item_data_get(item))
+                elm_object_item_del(item);
+          }
+        while ((item = elm_genlist_item_next_get(item)));
      }
 
    return ECORE_CALLBACK_PASS_ON;
diff --git a/src/bin/sinks_view.c b/src/bin/sinks_view.c
index f5f7f67..87cf5be 100644
--- a/src/bin/sinks_view.c
+++ b/src/bin/sinks_view.c
@@ -43,13 +43,15 @@ _sink_removed_cb(void *data, int type EINA_UNUSED, void *info)
    struct Sinks_View *sv = data;
    Emix_Sink *ev = info;
    Elm_Object_Item *item = elm_genlist_first_item_get(sv->genlist);
-   if (ev == elm_object_item_data_get(item))
-     elm_object_item_del(item);
 
-   while ((item = elm_genlist_item_next_get(item)))
+   if (item)
      {
-        if (ev == elm_object_item_data_get(item))
-          elm_object_item_del(item);
+        do
+          {
+             if (ev == elm_object_item_data_get(item))
+                elm_object_item_del(item);
+          }
+        while ((item = elm_genlist_item_next_get(item)));
      }
 
    return ECORE_CALLBACK_PASS_ON;
diff --git a/src/bin/sources_view.c b/src/bin/sources_view.c
index 80edee2..8bd883f 100644
--- a/src/bin/sources_view.c
+++ b/src/bin/sources_view.c
@@ -43,13 +43,15 @@ _source_removed_cb(void *data, int type EINA_UNUSED, void *info)
    struct Sources_View *sv = data;
    Emix_Source *source = info;
    Elm_Object_Item *item = elm_genlist_first_item_get(sv->genlist);
-   if (source == elm_object_item_data_get(item))
-     elm_object_item_del(item);
 
-   while ((item = elm_genlist_item_next_get(item)))
+   if (item)
      {
-        if (source == elm_object_item_data_get(item))
-          elm_object_item_del(item);
+        do
+          {
+             if (source == elm_object_item_data_get(item))
+                elm_object_item_del(item);
+          }
+        while ((item = elm_genlist_item_next_get(item)));
      }
 
    return ECORE_CALLBACK_PASS_ON;