Display correct recording date even if recording info is empty (closes Bug 1448)

3 files changed, 8 insertions, 5 deletions

diff --git a/HISTORY b/HISTORY
index cc0643a..f21f264 100644
--- a/HISTORY
+++ b/HISTORY
@@ -236,3 +236,4 @@ Version 0.1.4
   is available
 - Added Deadlock Patch
 - Changed default Channelseparator Icon (closes Bug 1412)
+- Display correct recording date even if recording info is empty (closes Bug 1448)
diff --git a/displaychannel.c b/displaychannel.c
index df54200..77bf517 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -1,6 +1,3 @@
-    #include "symbols/audio.xpm"
-#include "symbols/dolbydigital.xpm"
-
 #include "displaychannel.h"
 #include "services/tvscraper.h"
 
diff --git a/menuitem.c b/menuitem.c
index 74faba2..d72be9d 100644
--- a/menuitem.c
+++ b/menuitem.c
@@ -1159,9 +1159,14 @@ void cNopacityRecordingMenuItem::DrawRecDateTime(void) {
     cString strDateTime("");
     cString strDuration("");
     if (Event) {
-        cString strDate = Event->GetDateString();
+        std::string strDate = *(Event->GetDateString());
         cString strTime = Event->GetTimeString();
-        strDateTime = cString::sprintf("%s - %s", *strDate, *strTime);
+        if (strDate.find("1970") != std::string::npos) {
+            time_t start = Recording->Start();
+            strDateTime = cString::sprintf("%s %s", *DateString(start),*TimeString(start));
+        } else {
+            strDateTime = cString::sprintf("%s - %s", strDate.c_str(), *strTime);
+        }
         int duration = Event->Duration() / 60;
         int recDuration = Recording->LengthInSeconds();
         recDuration = (recDuration>0)?(recDuration / 60):0;