Fix for Prevent Issues

Signed-off-by: Bhavya Kumili <bhavya.k@samsung.com>
Change-Id: If3ba318b1d2cc8822855f2340359209895b20f22

diff --git a/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp b/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp
index d87d07c..e149d7e 100644 (file)
--- a/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp
@@ -1027,7 +1027,7 @@ _ScrollPanelPresenter::DoFlickGestureRecognized(_TouchFlickGestureDetector& gest
                                case _FLICK_DIRECTION_RIGHT:
                                        targetPosition = scrollArea.x - SCROLL_PANEL_OVERSCROLLING_MAX_DISTANCCE;
                                        break;
-                               default:
+                               case _FLICK_DIRECTION_NONE:
                                        break;
                                }
                        }

diff --git a/src/ui/controls/FUiCtrl_SplitPanelPresenter.cpp b/src/ui/controls/FUiCtrl_SplitPanelPresenter.cpp
index ba80af6..c7b4fbe 100644 (file)
--- a/src/ui/controls/FUiCtrl_SplitPanelPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_SplitPanelPresenter.cpp
@@ -554,10 +554,10 @@ _SplitPanelPresenter::LoadBitmap(SplitPanelDividerDirection splitPanelDividerDir
        }
 
        __pDividerPressedBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDividerBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA), __dividerPressedBackgroundColor);
-       SysTryCatch(NID_UI_CTRL, (__pDividerPressedBackgroundBitmap != null), , r, "[%s] Failed to get replacement color bitmap.", GetErrorMessage(GetLastResult()));
+       SysTryCatch(NID_UI_CTRL, (__pDividerPressedBackgroundBitmap != null), r = GetLastResult(), GetLastResult(), "[%s] Failed to get replacement color bitmap.", GetErrorMessage(GetLastResult()));
 
        __pDividerBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDividerBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA), __dividerBackgroundColor);
-       SysTryCatch(NID_UI_CTRL, (__pDividerBackgroundBitmap != null), , r, "[%s] Failed to get replacement color bitmap.", GetErrorMessage(GetLastResult()));
+       SysTryCatch(NID_UI_CTRL, (__pDividerBackgroundBitmap != null), r = GetLastResult(), GetLastResult(), "[%s] Failed to get replacement color bitmap.", GetErrorMessage(GetLastResult()));
 
        delete pDividerBackgroundBitmap;
 
@@ -566,8 +566,13 @@ _SplitPanelPresenter::LoadBitmap(SplitPanelDividerDirection splitPanelDividerDir
 CATCH:
        delete pDividerBackgroundBitmap;
        delete __pDividerBackgroundEffectBitmap;
+       __pDividerBackgroundEffectBitmap = null;
+
        delete __pDividerPressedBackgroundBitmap;
+       __pDividerPressedBackgroundBitmap = null;
+
        delete __pDividerThumbBitmap;
+       __pDividerThumbBitmap = null;
 
        return r;
 }