summaryrefslogtreecommitdiff
path: root/PLUGINS
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2016-12-22 14:13:42 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2016-12-22 14:13:42 +0100
commit39c9fc11993609dbe1d8de7a3811c25403d3049e (patch)
tree04d68dd94371b3217aeeaf86bcdb35036788e3ec /PLUGINS
parent99dfe9f66a5e33ab0ce55850f57901bf5fe11692 (diff)
downloadvdr-39c9fc11993609dbe1d8de7a3811c25403d3049e.tar.gz
vdr-39c9fc11993609dbe1d8de7a3811c25403d3049e.tar.bz2
Fixed truncated date/time strings in the skins on multi-byte UTF-8 systems
Diffstat (limited to 'PLUGINS')
-rw-r--r--PLUGINS/src/skincurses/HISTORY2
-rw-r--r--PLUGINS/src/skincurses/skincurses.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index d4673f26..2a2bccb0 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -135,3 +135,5 @@ VDR Plugin 'skincurses' Revision History
- Added cFont::Width(void) to get the default character width and allow stretched
font drawing in high level OSDs (dummy for skincurses).
+- Fixed truncated date/time strings in the skins on multi-byte UTF-8 systems
+ (reported by Sergey Chernyavskiy).
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 2d98f5b9..d11736be 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: skincurses.c 4.1 2016/12/22 12:50:20 kls Exp $
+ * $Id: skincurses.c 4.2 2016/12/22 14:09:09 kls Exp $
*/
#include <ncurses.h>
@@ -408,8 +408,7 @@ void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event)
return;
int y = 2;
cTextScroller ts;
- char t[32];
- snprintf(t, sizeof(t), "%s %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString());
+ cString t = cString::sprintf("%s %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString());
ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, t, &Font, clrYellow, clrBackground);
if (Event->Vps() && Event->Vps() != Event->StartTime()) {
cString buffer = cString::sprintf(" VPS: %s", *Event->GetVpsString());