fix error handling bug

Change-Id: I916c2f3307177c0e2eeaf0d8d0d66b35bcb9c8da
Signed-off-by: Jehun Lim <jehun.lim@samsung.com>

diff --git a/src/main.cpp b/src/main.cpp
index d6b8236..1ed9418 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -112,6 +112,11 @@ public:
        {
                CViewMgr::Finalize();
 
+               delete pGalleryView;
+               delete pPhotoViewerView;
+               delete pPhotoZoomView;
+               delete pCtxtMenuView;
+
                t_RemoveArglist();
 
                if (ad.win)
@@ -233,7 +238,7 @@ public:
                vmgr = CViewMgr::GetInstance();
                if (!vmgr) {
                        _ERR("ViewMgr initialization failed");
-                       goto error;
+                       elm_exit();
                }
 
                pGalleryView = new CGalleryView(VIEW_GALLERY);
@@ -248,18 +253,12 @@ public:
 
                if (!vmgr->PushView(VIEW_GALLERY, ad.arglist)) {
                        _ERR("ViewMgr push failed");
-                       CViewMgr::Finalize();
-                       goto error;
+                       elm_exit();
                }
 
                ad.is_service = 1;
 
                return;
-
-       error:
-               free(ad.arglist->id);
-               free(ad.arglist);
-               elm_exit();
        }
 
 public: