summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2005-02-12 15:07:09 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2005-02-12 15:07:09 +0100
commita481a5200c266dd387d1dca8a0253abfb208f031 (patch)
tree92bdaf768efa12a3da1a1e34927a6e33f629459e
parentdc22034e72d8695dddf1fe511012f3afd1a7abbd (diff)
downloadvdr-a481a5200c266dd387d1dca8a0253abfb208f031.tar.gz
vdr-a481a5200c266dd387d1dca8a0253abfb208f031.tar.bz2
Fixed a typo in detecting UTF-8
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY1
-rw-r--r--vdr.c6
3 files changed, 5 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 13f2115b..ba8931d4 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -929,6 +929,7 @@ Reinhard Nissl <rnissl@gmx.de>
for modifying cDolbyRepacker to make sure PES packets don't exceed the requested length
for fixing a possible freeze in pause mode in case a device's PlayPesPacket()
function permanently returns 0
+ for fixing a typo in detecting UTF-8
Richard Robson <richard_robson@beeb.net>
for reporting freezing replay if a timer starts while in Transfer Mode from the
diff --git a/HISTORY b/HISTORY
index d87b984a..bab60b65 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3398,3 +3398,4 @@ Video Disk Recorder Revision History
clearing the buffer.
- Added DeviceClrAvailableTracks() and DeviceSetCurrentAudioTrack() to cPlayer
(thanks to Marco Schlüßler).
+- Fixed a typo in detecting UTF-8 (thanks to Reinhard Nissl).
diff --git a/vdr.c b/vdr.c
index 6b2ac379..15aff949 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/vdr
*
- * $Id: vdr.c 1.201 2005/01/30 14:15:50 kls Exp $
+ * $Id: vdr.c 1.202 2005/02/12 15:06:16 kls Exp $
*/
#include <getopt.h>
@@ -100,8 +100,8 @@ int main(int argc, char *argv[])
// Check for UTF-8 and exit if present - asprintf() will fail if it encounters 8 bit ASCII codes
char *LangEnv;
- if ((LangEnv = getenv("LANG")) != NULL && strcasestr(LangEnv, "utf") ||
- (LangEnv = getenv("LC_TYPE")) != NULL && strcasestr(LangEnv, "utf")) {
+ if ((LangEnv = getenv("LANG")) != NULL && strcasestr(LangEnv, "utf") ||
+ (LangEnv = getenv("LC_CTYPE")) != NULL && strcasestr(LangEnv, "utf")) {
fprintf(stderr, "vdr: please turn off UTF-8 before starting VDR\n");
return 2;
}