From: ghost <andreas.monzner@multimedia-labs.de>
Date: Fri, 24 Apr 2009 10:03:28 +0000 (+0200)
Subject: Merge branch 'master' of git.opendreambox.org:/git/enigma2
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=019ba406ed5ba46782951d501ed2d4c0a96e6096;hp=056af5306995176e457ddd471aa2b5c3a5223c4f

Merge branch 'master' of git.opendreambox.org:/git/enigma2
---

diff --git a/RecordTimer.py b/RecordTimer.py
index 381720e..fd2da33 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -186,7 +186,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
 
 			prep_res=self.record_service.prepare(self.Filename + ".ts", self.begin, self.end, event_id, self.name.replace("\n", ""), self.description.replace("\n", ""), ' '.join(self.tags))
 			if prep_res:
-				if prep_rest == 255:
+				if prep_res == 255:
 					self.log(4, "failed to write meta information")
 				else:
 					self.log(2, "'prepare' failed: error %d" % prep_res)
diff --git a/lib/service/servicedvbrecord.cpp b/lib/service/servicedvbrecord.cpp
index 294315e..6978849 100644
--- a/lib/service/servicedvbrecord.cpp
+++ b/lib/service/servicedvbrecord.cpp
@@ -132,6 +132,8 @@ RESULT eDVBServiceRecord::prepare(const char *filename, time_t begTime, time_t e
 				meta.m_name = name;
 			if (descr)
 				meta.m_description = descr;
+			if (tags)
+				meta.m_tags = tags;
 			ret = meta.updateMeta(filename) ? -255 : 0;
 			if (!ret)
 			{