summaryrefslogtreecommitdiff
path: root/menuitems.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2006-04-23 18:00:00 +0200
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2006-04-23 18:00:00 +0200
commit880c3ddb94c09d6cca411363ed6f981d4e150fd2 (patch)
treec7f88180032f51938367727f145928528406c0c4 /menuitems.c
parent293ed4027ed3c3c8fd6ef1e8bdd79bfe69193957 (diff)
downloadvdr-patch-lnbsharing-880c3ddb94c09d6cca411363ed6f981d4e150fd2.tar.gz
vdr-patch-lnbsharing-880c3ddb94c09d6cca411363ed6f981d4e150fd2.tar.bz2
Version 1.3.48vdr-1.3.48
- Updated the GPL copies (thanks to Ville Skyttä). - Fixed several spelling errors (thanks to Ville Skyttä). - Updated the Polish OSD texts (thanks to Jaroslaw Swierczynski). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Updated the French OSD texts (thanks to Pierre Briec). - Updated the Estonian OSD texts (thanks to Arthur Konovalov). - Updated the Romanian OSD texts (thanks to Lucian Muresan). - Updated the Danish OSD texts (thanks to Mogens Elneff). - Updated the Russian OSD texts (thanks to Oleg Roitburd). - Updated the Slovenian OSD texts (thanks to Matjaz Thaler). - Fixed wrong credits for the patch that was used to implement cPlugin::Active(). - Simplified the 'grep|awk|sed' command to retrieve the VDR/APIVERSION to a single 'sed' call. - Updated the Swedish OSD texts (thanks to Tomas Prybil). - Modified the German OSD texts to be "less technical" (thanks to Andreas Brachold). - Extended the version number reported with the '-V' option to also show the current APIVERSION (suggested by Thomas Günther). - Fixed handling empty titles in cEvent::FixEpgBugs() (reported by Rolf Ahrenberg). - Fixed some missing '-' in the German OSD texts (thanks to Walter Koch). - Added an error message about plugins that don't honor APIVERSION in their Makefile (based on a suggestion by Udo Richter). - Fixed a format string in recording.c to avoid a compiler warning on 64bit systems (thanks to Christian Wieninger for reporting, and Werner Schweer for pointing out that the 'z' modifier should be used here). - Ignoring k_Repeat when deciding whether the same key has been pressed in string input fields (based on a patch from Marko Mäkelä).
Diffstat (limited to 'menuitems.c')
-rw-r--r--menuitems.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/menuitems.c b/menuitems.c
index e756e8d..ef7cccc 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menuitems.c 1.42 2006/04/14 10:41:28 kls Exp $
+ * $Id: menuitems.c 1.43 2006/04/23 11:39:48 kls Exp $
*/
#include "menuitems.h"
@@ -351,10 +351,10 @@ char cMenuEditStrItem::Inc(char c, bool Up)
eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
{
- bool SameKey = Key == lastKey;
+ bool SameKey = NORMALKEY(Key) == lastKey;
if (Key != kNone)
- lastKey = Key;
- else if (!newchar && k0 <= NORMALKEY(lastKey) && NORMALKEY(lastKey) <= k9 && autoAdvanceTimeout.TimedOut()) {
+ lastKey = NORMALKEY(Key);
+ else if (!newchar && k0 <= lastKey && lastKey <= k9 && autoAdvanceTimeout.TimedOut()) {
AdvancePos();
newchar = true;
currentChar = NULL;
@@ -460,7 +460,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
}
if (!currentChar || !*currentChar || *currentChar == '\t') {
// find the beginning of the character map entry for Key
- int n = Key - k0;
+ int n = NORMALKEY(Key) - k0;
currentChar = charMap;
while (n > 0 && *currentChar) {
if (*currentChar++ == '\t')