summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlado <herrlado@gmail.com>2013-03-23 23:50:06 +0100
committerlado <herrlado@gmail.com>2013-03-23 23:50:06 +0100
commitdbf28d356eb97b3075229bbc42a8a3ccf1c94ec0 (patch)
treeba658b87600768f125a3e25299745986c2babe6a
parentaf7106947627e96cc796037d90b42e3fe630a575 (diff)
downloadvdr-manager-dbf28d356eb97b3075229bbc42a8a3ccf1c94ec0.tar.gz
vdr-manager-dbf28d356eb97b3075229bbc42a8a3ccf1c94ec0.tar.bz2
Bug #1047
-rw-r--r--vdrmanager/src/de/bjusystems/vdrmanager/data/Timer.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/data/Timer.java b/vdrmanager/src/de/bjusystems/vdrmanager/data/Timer.java
index 6b8dd09..fd51a9a 100644
--- a/vdrmanager/src/de/bjusystems/vdrmanager/data/Timer.java
+++ b/vdrmanager/src/de/bjusystems/vdrmanager/data/Timer.java
@@ -3,10 +3,13 @@ package de.bjusystems.vdrmanager.data;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
+import java.util.TimeZone;
import de.bjusystems.vdrmanager.StringUtils;
import de.bjusystems.vdrmanager.app.C;
+import de.bjusystems.vdrmanager.app.VdrManagerApp;
+import de.bjusystems.vdrmanager.data.db.DBAccess;
import de.bjusystems.vdrmanager.gui.Utils;
/**
@@ -153,8 +156,11 @@ public class Timer extends Event implements Timerable {
line.append(flags).append(":");
line.append(channelNumber).append(":");
- final Calendar cal = new GregorianCalendar();
+ final Calendar cal = Calendar.getInstance();
cal.setTime(start);
+
+ cal.setTimeZone(TimeZone.getTimeZone(Preferences.get().getCurrentVdr().getServerTimeZone()));
+
line.append((weekdays.equals("-------") == false ? weekdays + "@" : "") + String.format("%04d-%02d-%02d:", cal.get(Calendar.YEAR),
cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH)));
line.append(String.format("%02d%02d:", cal.get(Calendar.HOUR_OF_DAY),