summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJisung Ahn <jcastle.ahn@samsung.com>2012-09-06 04:35:54 (GMT)
committerJisung Ahn <jcastle.ahn@samsung.com>2012-09-06 04:35:54 (GMT)
commit73dc415faa98b5eaac832bc3eaeb84e8793d8878 (patch)
tree11bae9bb9961c57664cba7a524cebde5dcc1487e
parent44e716a2aa828271ab1d1ba367eec3c627b1e36c (diff)
downloadug-image-viewer-efl-73dc415faa98b5eaac832bc3eaeb84e8793d8878.zip
ug-image-viewer-efl-73dc415faa98b5eaac832bc3eaeb84e8793d8878.tar.gz
ug-image-viewer-efl-73dc415faa98b5eaac832bc3eaeb84e8793d8878.tar.bz2
fix destroy me, remove danger code
Change-Id: Ic8f2466582803b6b61629b2f4fc76cbb509b5942
-rwxr-xr-xmain/src/slider/ivug-slider-item.cpp14
-rwxr-xr-xmain/src/view/ivug-main-view.cpp4
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;
}