prevent issue fixed

Change-Id: Iaa49b6584440e2689cfe9ce8b6394d05c68a8112

diff --git a/src/IntBookmarkListForm.cpp b/src/IntBookmarkListForm.cpp
index 3821049..1d5e0a6 100644 (file)
--- a/src/IntBookmarkListForm.cpp
+++ b/src/IntBookmarkListForm.cpp
@@ -586,6 +586,8 @@ BookmarkListForm::CreateItem(int index, int itemWidth)
        {
                delete pItem;
                pItem = null;
+               delete pImage;
+               pImage = null;
                return NULL;
        }
        if ( pBookMark->GetBookmarkType() == BOOKMARK_TYPE_FOLDER )

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index f16dbc7..ad12dd8 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -1318,52 +1318,53 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                                        }
                                                }
                                        }
-                                       if (pSceneManager->GetCurrentSceneId() == pWindowInfo->sceneID && pWindowInfo->isJavascriptInitiated == true)
+                                       else
                                        {
-                                               r = SceneRegister::DestroyAndUnRegisterScene(pWindowInfo->sceneID);
-                                               if (IsFailed(r))
-                                               {
-                                                       AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
-                                                       return;
-                                               }
-                                               r = pAllWindowList->RemoveAt(count, true);
-                                               __pWindowInfo = null;
-                                               if (IsFailed(r))
-                                               {
-                                                       AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
-                                                       return;
-                                               }
-                                               if(count > 0)
-                                               {
-                                                       pWindowInfo = dynamic_cast< WindowInfo* >(pAllWindowList->GetAt(count - 1));
-                                               }
-                                               else
-                                               {
-                                                       pWindowInfo = dynamic_cast< WindowInfo* >(pAllWindowList->GetAt(pAllWindowList->GetCount() - 1));
-                                               }
-                                               if (pWindowInfo == null)
+                                               if (pSceneManager->GetCurrentSceneId() == pWindowInfo->sceneID && pWindowInfo->isJavascriptInitiated == true)
                                                {
-                                                       pApp = UiApp::GetInstance();
-                                                       if (pApp != null)
+                                                       r = SceneRegister::DestroyAndUnRegisterScene(pWindowInfo->sceneID);
+                                                       if (IsFailed(r))
                                                        {
-                                                               r = pApp->Terminate();
+                                                               AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
                                                                return;
                                                        }
-                                               }
-                                               else
-                                               {
-                                                       r = pSceneManager->GoBackward(BackwardSceneTransition(pWindowInfo->sceneID ,SCENE_TRANSITION_ANIMATION_TYPE_NONE));
+                                                       r = pAllWindowList->RemoveAt(count, true);
+                                                       __pWindowInfo = null;
                                                        if (IsFailed(r))
                                                        {
                                                                AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
                                                                return;
                                                        }
+                                                       if(count > 0)
+                                                       {
+                                                               pWindowInfo = dynamic_cast< WindowInfo* >(pAllWindowList->GetAt(count - 1));
+                                                       }
+                                                       else
+                                                       {
+                                                               pWindowInfo = dynamic_cast< WindowInfo* >(pAllWindowList->GetAt(pAllWindowList->GetCount() - 1));
+                                                       }
+                                                       if (pWindowInfo == null)
+                                                       {
+                                                               pApp = UiApp::GetInstance();
+                                                               if (pApp != null)
+                                                               {
+                                                                       r = pApp->Terminate();
+                                                                       return;
+                                                               }
+                                                       }
+                                                       else
+                                                       {
+                                                               r = pSceneManager->GoBackward(BackwardSceneTransition(pWindowInfo->sceneID ,SCENE_TRANSITION_ANIMATION_TYPE_NONE));
+                                                               if (IsFailed(r))
+                                                               {
+                                                                       AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
+                                                                       return;
+                                                               }
+                                                       }
+                                                       break;
                                                }
-                                               break;
                                        }
-
                                }
-
                        }
                }
                break;