From cd676fda36688c2a125965501732e92afad3fa50 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Wed, 14 Mar 2012 09:12:58 +0100 Subject: [PATCH] Moved setting LC_NUMERIC further up to make sure any floating point numbers use a decimal point --- CONTRIBUTORS | 2 ++ HISTORY | 4 +++- vdr.c | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 6bebb8a0..7b3b6941 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2329,6 +2329,8 @@ Tobias Grimm for a patch that added a workaround for the broken linux-dvb driver header files for reporting a faulty "frame duration" instead of "frame rate" in vdr.5 for avoiding a gcc 4.6 compiler error in the skincurses plugin. + for suggesting to move setting LC_NUMERIC further up to make sure any floating point + numbers use a decimal point Helge Lenz for reporting a bug in setting the 'Delta' parameter when calling the shutdown diff --git a/HISTORY b/HISTORY index 6a173bd8..e4d8aac8 100644 --- a/HISTORY +++ b/HISTORY @@ -7010,7 +7010,7 @@ Video Disk Recorder Revision History which is higher than any normal table id that is broadcast in the EIT data. See PLUGINS.html, section "Electronic Program Guide" for more information. -2012-03-13: Version 1.7.27 +2012-03-14: Version 1.7.27 - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Changed the Green button in the "Edit timer" menu from "Once" to "Single" @@ -7043,3 +7043,5 @@ Video Disk Recorder Revision History - No longer using GetFont() (which is not thread safe) in the 'osddemo' plugin. - No longer using GetFont() (which is not thread safe) in cSubtitleRegion::UpdateTextData(). - Fixed a memory leak in cSubtitleRegion::UpdateTextData(). +- Moved setting LC_NUMERIC further up to make sure any floating point numbers use a + decimal point (suggested by Tobias Grimm). diff --git a/vdr.c b/vdr.c index 6df53fdd..bafd4efd 100644 --- a/vdr.c +++ b/vdr.c @@ -22,7 +22,7 @@ * * The project's page is at http://www.tvdr.de * - * $Id: vdr.c 2.34 2012/03/09 09:55:15 kls Exp $ + * $Id: vdr.c 2.35 2012/03/14 09:09:19 kls Exp $ */ #include @@ -173,6 +173,7 @@ int main(int argc, char *argv[]) // Initiate locale: setlocale(LC_ALL, ""); + setlocale(LC_NUMERIC, "C"); // makes sure any floating point numbers written use a decimal point // Command line options: @@ -550,7 +551,6 @@ int main(int argc, char *argv[]) isyslog("codeset is '%s' - %s", CodeSet, known ? "known" : "unknown"); cCharSetConv::SetSystemCharacterTable(CodeSet); } - setlocale(LC_NUMERIC, "C"); // makes sure any floating point numbers written use a decimal point // Initialize internationalization: