fixed bug in recordings list menu

3 files changed, 8 insertions, 6 deletions

diff --git a/HISTORY b/HISTORY
index 65ac438..7f7b6cc 100644
--- a/HISTORY
+++ b/HISTORY
@@ -28,5 +28,5 @@ Version 0.0.2
 - fixed bug that new font was displayed first after VDR restart when font was changed in OSD Setup menu
 - display always newest recording of folders in recordings list, thanks@ Lars Hanisch for providing the patch
 - added extented recording information
-- added token {nummenuitem} as number of item in for every list, value starts with 1
+- added token {nummenuitem} as number of item for every list, value starts with 1
 
diff --git a/libcore/recfolderinfo.c b/libcore/recfolderinfo.c
index db4470d..d03ed6c 100644
--- a/libcore/recfolderinfo.c
+++ b/libcore/recfolderinfo.c
@@ -71,10 +71,12 @@ void cRecordingsFolderInfo::Rebuild(void)
 #if APIVERSNUM < 20102
       //cRecording::Folder() first available since VDR 2.1.2
       const char *recName = rec->Name();
-      if (const char *s = strrchr(recName, FOLDERDELIMCHAR))
-        folder = cString(recName, s);
+      if (const char *s = strrchr(recName, FOLDERDELIMCHAR)) {
+         folder = recName;
+         folder.Truncate(s - recName);
+         }
       else
-        folder = "";
+         folder = "";
 #else
       folder = rec->Folder();
 #endif
diff --git a/libtemplate/templateview.c b/libtemplate/templateview.c
index 490426b..ea77b77 100644
--- a/libtemplate/templateview.c
+++ b/libtemplate/templateview.c
@@ -41,7 +41,7 @@ void cTemplateView::SetParameters(vector<pair<string, string> > &params) {
     parameters->SetParameters(params);
 }
 
-void cTemplateView::SetContainer(int x, int y, int width, int height) { 
+void cTemplateView::SetContainer(int x, int y, int width, int height) {
     containerX = x;
     containerY = y;
     containerWidth = width; 
@@ -341,7 +341,7 @@ void cTemplateView::PreCache(bool isSubview) {
     }
     //Calculate OSD Size
     parameters->CalculateParameters();
-    
+
     int osdX = parameters->GetNumericParameter(ptX);
     int osdY = parameters->GetNumericParameter(ptY);
     int osdWidth = parameters->GetNumericParameter(ptWidth);