Index: TVHome.cs
===================================================================
--- TVHome.cs	(revision 28100)
+++ TVHome.cs	(working copy)
@@ -713,34 +713,37 @@
         return;
       }
 
-      UpdateRecordingIndicator();
-      UpdateStateOfRecButton();
-
-      if (!Card.IsTimeShifting)
+      try
       {
-        UpdateProgressPercentageBar();
-        // mantis #2218 : TV guide information in TV home screen does not update when program changes if TV is not playing 
-        return;
-      }
+        UpdateRecordingIndicator();
+        UpdateStateOfRecButton();
 
-      // BAV, 02.03.08: a channel change should not be delayed by rendering.
-      //                by moving thisthe 1 min delays in zapping should be fixed
-      // Let the navigator zap channel if needed
-      if (Navigator.CheckChannelChange())
-      {
-        UpdateGUIonPlaybackStateChange();
+        if (!Card.IsTimeShifting)
+        {
+          UpdateProgressPercentageBar();
+          // mantis #2218 : TV guide information in TV home screen does not update when program changes if TV is not playing 
+          return;
+        }
+
+        // BAV, 02.03.08: a channel change should not be delayed by rendering.
+        //                by moving thisthe 1 min delays in zapping should be fixed
+        // Let the navigator zap channel if needed
+        if (Navigator.CheckChannelChange())
+        {
+          UpdateGUIonPlaybackStateChange();
+        }
+
+        if (GUIGraphicsContext.InVmr9Render)
+        {
+          return;
+        }
+        ShowCiMenu();
+        doProcess();
       }
-
-      if (GUIGraphicsContext.InVmr9Render)
+      finally
       {
-        return;
+        _updateTimer = DateTime.Now;
       }
-
-      ShowCiMenu();
-
-      doProcess();
-
-      _updateTimer = DateTime.Now;
     }
 
     public override bool IsTv
Index: TVHomeNavigator.cs
===================================================================
--- TVHomeNavigator.cs	(revision 28100)
+++ TVHomeNavigator.cs	(working copy)
@@ -390,8 +390,7 @@
       // BAV, 02.03.08: a channel change should not be delayed by rendering.
       //                by scipping this => 1 min delays in zapping should be avoided 
       //if (GUIGraphicsContext.InVmr9Render) return false;
-      reentrant = true;
-      UpdateCurrentChannel();
+      reentrant = true;      
 
       // Zapping to another group or channel?
       if (m_zapgroup != -1 || m_zapchannel != null)
@@ -399,6 +398,7 @@
         // Time to zap?
         if (DateTime.Now >= m_zaptime)
         {
+          UpdateCurrentChannel();
           // Zapping to another group?
           if (m_zapgroup != -1 && m_zapgroup != m_currentgroup)
           {