From 73dc415faa98b5eaac832bc3eaeb84e8793d8878 Mon Sep 17 00:00:00 2001 From: Jisung Ahn Date: Thu, 6 Sep 2012 13:35:54 +0900 Subject: fix destroy me, remove danger code Change-Id: Ic8f2466582803b6b61629b2f4fc76cbb509b5942 --- main/src/slider/ivug-slider-item.cpp | 14 ++------------ main/src/view/ivug-main-view.cpp | 4 ++-- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/main/src/slider/ivug-slider-item.cpp b/main/src/slider/ivug-slider-item.cpp index 490bcc5..4dc7121 100755 --- a/main/src/slider/ivug-slider-item.cpp +++ b/main/src/slider/ivug-slider-item.cpp @@ -350,18 +350,8 @@ static bool _set_mitem(Slide_Item* si, Media_Item *item) static bool _unset_mitem(Slide_Item* si) -{ - Media_Data *mdata = ivug_medialist_get_data(si->mitem); - - si->state = SLIDE_STATE_NONE; - - if ( mdata == NULL ) - { - MSG_SITEM_ERROR("Data is NULL"); - return true; - } - - MSG_SITEM_HIGH("Clear Image. %s", ivug_get_filename(mdata->filepath)); +{ + si->state = SLIDE_STATE_NONE; // Unswallow photocam/videocam edje_object_part_unswallow(si->layout, edje_object_part_swallow_get(si->layout, "slider.contents")); diff --git a/main/src/view/ivug-main-view.cpp b/main/src/view/ivug-main-view.cpp index 3f258e0..c5bbf3d 100755 --- a/main/src/view/ivug-main-view.cpp +++ b/main/src/view/ivug-main-view.cpp @@ -758,7 +758,7 @@ static void _on_remove_main_view_ui(Ivug_MainView *pMainView) pMainView->mList = NULL; } - DESTROY_ME(); + //DESTROY_ME(); } @@ -777,7 +777,7 @@ _on_slider_item_changed(void *data, Evas_Object *obj, void *event_info) // There is no item existed. terminate UG MSG_MAIN_ERROR("No item is remained. exit UG. Sitem=0x%08x", sitem); _on_remove_main_view_ui(pMainView); - //DESTROY_ME(); + DESTROY_ME(); return; } -- cgit v1.2.3