From: ghost <andreas.monzner@multimedia-labs.de>
Date: Fri, 21 Aug 2009 09:53:46 +0000 (+0200)
Subject: epgcache.cpp: fix restoring the timezone after mhwepg read
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=3b755b060d094e5a2fef620fafbd237196054540;ds=sidebyside

epgcache.cpp: fix restoring the timezone after mhwepg read
---

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index 4ea4796..f80e177 100644
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -2811,6 +2811,7 @@ void eEPGCache::channel_data::timeMHW2DVB( int minutes, u_char *return_time)
 void eEPGCache::channel_data::timeMHW2DVB( u_char day, u_char hours, u_char minutes, u_char *return_time)
 // For date plus time of day
 {
+	char tz_saved[1024];
 	// Remove offset in mhw time.
 	__u8 local_hours = hours;
 	if ( hours >= 16 )
@@ -2823,6 +2824,8 @@ void eEPGCache::channel_data::timeMHW2DVB( u_char day, u_char hours, u_char minu
 	time_t dt = ::time(0);
 
 	char *old_tz = getenv( "TZ" );
+	if (old_tz)
+		strcpy(tz_saved, old_tz);
 	putenv("TZ=CET-1CEST,M3.5.0/2,M10.5.0/3");
 	tzset();
 
@@ -2845,7 +2848,7 @@ void eEPGCache::channel_data::timeMHW2DVB( u_char day, u_char hours, u_char minu
 	if ( old_tz == NULL )
 		unsetenv( "TZ" );
 	else
-		putenv( old_tz );
+		setenv("TZ", tz_saved, 1);
 	tzset();
 
 	// Calculate MJD according to annex in ETSI EN 300 468