Fix for N_SE-51385

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

diff --git a/src/ui/controls/FUiCtrl_EditTime.cpp b/src/ui/controls/FUiCtrl_EditTime.cpp
index 6bdc84c..d612cdb 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditTime.cpp
+++ b/src/ui/controls/FUiCtrl_EditTime.cpp
@@ -1146,8 +1146,9 @@ _EditTime::OnScrollStopped(Tizen::Ui::_Control& source)
 void
 _EditTime::OnScrollPositionChanged(Tizen::Ui::_Control& source, float scrollPosition)
 {
-       if (GetDateTimeBar()->IsActivated())
+       if (GetDateTimeBar()->IsActivated() && __pParentPanel != null && __pParentPanel->IsScrollAnimationRunning())
        {
+               __pEditTimePresenter->SetLastSelectedId(DATETIME_ID_NONE);
                GetDateTimeBar()->SetVisibleState(false);
                GetDateTimeBar()->Close();
        }