From 84fb95ec574e057f840b0757eae9e16f02e7f516 Mon Sep 17 00:00:00 2001
From: Gaurav Bhatt <gaurav.bhatt@samsung.com>
Date: Mon, 15 Jul 2013 16:16:03 +0530
Subject: [PATCH] Fix for N_SE-46347

Change-Id: I4a815730760679400dd44c6384ba663ce1146011
Signed-off-by: Gaurav Bhatt <gaurav.bhatt@samsung.com>
---
 inc/ClEventEditorForm.h   |  3 +++
 src/ClEventEditorForm.cpp | 13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/inc/ClEventEditorForm.h b/inc/ClEventEditorForm.h
index 53100b8..b83f8d0 100644
--- a/inc/ClEventEditorForm.h
+++ b/inc/ClEventEditorForm.h
@@ -26,6 +26,7 @@
 #include <FGraphics.h>
 #include <FSocial.h>
 #include <FUi.h>
+#include "ClICalendarEventChangedEventListener.h"
 
 class CalendarSelectorPopup;
 class EventPresentationModel;
@@ -38,6 +39,7 @@ class EventEditorForm
 	, public virtual Tizen::Ui::Controls::ISectionTableViewItemEventListener
 	, public virtual Tizen::Ui::Controls::ISectionTableViewItemProvider
 	, public virtual Tizen::Ui::Scenes::ISceneEventListener
+	, public virtual ICalendarEventChangedEventListener
 {
 public:
 	result Initialize(void);
@@ -80,6 +82,7 @@ public:
 										const Tizen::Ui::Scenes::SceneId& nextSceneId);
 
 	virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
+	virtual void OnCalendarEventChanged(void);
 
 private:
 	enum EditEventFormStyle
diff --git a/src/ClEventEditorForm.cpp b/src/ClEventEditorForm.cpp
index 7d36740..9e01661 100644
--- a/src/ClEventEditorForm.cpp
+++ b/src/ClEventEditorForm.cpp
@@ -890,6 +890,7 @@ EventEditorForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
 	}
 
 	__pTableView->SetItemChecked(GROUP_DATE_SELECTOR, DATE_SELECTOR_ITEM_ALL_DAY_EVENT, __pPm->IsAllDayEvent());
+	__pPm->AddCalendarEventChangedEventListener(*this);
 
 	if (pArgs)
 	{
@@ -1021,6 +1022,18 @@ EventEditorForm::OnActionPerformed(const Control& source, int actionId)
 	SetFocus();
 }
 
+void
+EventEditorForm::OnCalendarEventChanged(void)
+{
+	if(__pPm->IsEventValid() == false)
+	{
+		Tizen::Base::Collection::IListT<SceneId> *ptr = SceneManager::GetInstance()->GetSceneHistoryN();
+		SceneId original;
+		ptr->GetAt(0,original);
+		SceneManager::GetInstance()->GoBackward(BackwardSceneTransition(original));
+	}
+
+}
 TableViewItem*
 EventEditorForm::CreateTitleItemN(int itemWidth, const String& title)
 {
-- 
2.7.4