From 2fc075f5f93d0207afc27e88659cedc66d392204 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 2 Oct 2005 12:59:53 +0200
Subject: The CAM menu now automatically updates itself in case of a progress
 display

---
 HISTORY | 2 ++
 ci.c    | 7 ++++++-
 ci.h    | 3 ++-
 menu.c  | 6 +++++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/HISTORY b/HISTORY
index 73be708f..0a3c8f68 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3871,3 +3871,5 @@ Video Disk Recorder Revision History
 - Improved displaying 'sub-title' and 'bottom text' in the CAM menu.
 - Added status message "Resetting CAM..." for an immediate feedback when the CAM
   reset has been triggered.
+- The CAM menu now automatically updates itself in case of a progress display (as
+  used, for instance, when updating the firmware via satellite).
diff --git a/ci.c b/ci.c
index 4e341d75..a0c63d65 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.28 2005/09/17 11:43:08 kls Exp $
+ * $Id: ci.c 1.29 2005/10/02 12:51:42 kls Exp $
  */
 
 #include "ci.h"
@@ -1229,6 +1229,11 @@ bool cCiMenu::AddEntry(char *s)
   return false;
 }
 
+bool cCiMenu::HasUpdate(void)
+{
+  return mmi->HasUserIO();
+}
+
 bool cCiMenu::Select(int Index)
 {
   cMutexLock MutexLock(&mutex);
diff --git a/ci.h b/ci.h
index 9d718951..483a83ec 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 1.14 2005/08/20 14:56:11 kls Exp $
+ * $Id: ci.h 1.15 2005/10/02 12:51:22 kls Exp $
  */
 
 #ifndef __CI_H
@@ -40,6 +40,7 @@ public:
   bool Selectable(void) { return selectable; }
   bool Select(int Index);
   bool Cancel(void);
+  bool HasUpdate(void);
   };
 
 class cCiEnquiry {
diff --git a/menu.c b/menu.c
index 96e07c0a..8d8ecb96 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.366 2005/10/02 10:08:57 kls Exp $
+ * $Id: menu.c 1.367 2005/10/02 12:56:19 kls Exp $
  */
 
 #include "menu.h"
@@ -1338,6 +1338,10 @@ eOSState cMenuCam::ProcessKey(eKeys Key)
        default: break;
        }
      }
+  if (ciMenu->HasUpdate()) {
+     selected = true; // just to not call ciMenu->Cancel()
+     return osEnd;
+     }
   return state;
 }
 
-- 
cgit v1.2.3