--- a/clock2/clockui/uilayer/clkdatetimeview/src/clkdatetimeview.cpp	Tue Apr 27 16:36:22 2010 +0300
+++ b/clock2/clockui/uilayer/clkdatetimeview/src/clkdatetimeview.cpp	Tue May 11 16:12:24 2010 +0300
@@ -1758,16 +1758,7 @@
 //
 void CClkDateTimeView::HandleTimeCmdL()
     {
-    if( iExtension->GetActiveProtocol() )
-		{
-   
-		// User pressed Yes. We disable Automatic time update here.
-		iDateTimeInfo.iNITZ = EFalse;
-		iSrvModel->DeActivateAllProtocols();
-		iExtension->SetActiveProtocol( EFalse );
-       	ShowAutomaticTimeUpdateOffNoteL();
-		}
-
+    
     // User to be notified whether DST rollover happens in a day or has happen within a day if he tries to change the time.
 	TBool dstStatus = CheckForDSTChangesL();
 	
@@ -1778,6 +1769,15 @@
 	    CAknTimeSettingPage* dlg = new ( ELeave ) CAknTimeSettingPage( R_DATE_TIME_TIME_PAGE, newTime );
 	    if( dlg->ExecuteLD( CAknSettingPage::EUpdateWhenAccepted ) )
 	        {
+	    
+            if( iExtension->GetActiveProtocol() )
+                {
+                // User pressed Yes. We disable Automatic time update here.
+                iDateTimeInfo.iNITZ = EFalse;
+                iSrvModel->DeActivateAllProtocols();
+                iExtension->SetActiveProtocol( EFalse );
+                ShowAutomaticTimeUpdateOffNoteL();
+                }
 	        TTime current;
 	        current.HomeTime();
 	        TDateTime cTime( current.DateTime() );