diff --git a/bin/SnapshotWatch.prg b/bin/SnapshotWatch.prg
index 1259d73..65ee57c 100644
Binary files a/bin/SnapshotWatch.prg and b/bin/SnapshotWatch.prg differ
diff --git a/bin/SnapshotWatch.prg.debug.xml b/bin/SnapshotWatch.prg.debug.xml
index 639291f..334b667 100644
--- a/bin/SnapshotWatch.prg.debug.xml
+++ b/bin/SnapshotWatch.prg.debug.xml
@@ -268,46 +268,47 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -491,18 +492,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/source/SnapshotWatchView.mc b/source/SnapshotWatchView.mc
index f7f2e5b..23050c8 100644
--- a/source/SnapshotWatchView.mc
+++ b/source/SnapshotWatchView.mc
@@ -516,6 +516,9 @@ class SnapshotWatchView extends Ui.WatchFace {
var sc = new SunCalc();
var lat;
var lon;
+ var timeStringRise = " --:--";
+ var timeStringSet = " --:--";
+
var loc = Activity.getActivityInfo().currentLocation;
if (loc == null)
@@ -537,7 +540,6 @@ class SnapshotWatchView extends Ui.WatchFace {
if(lat != null && lon != null)
{
var ampm;
- var timeString;
var now = new Time.Moment(Time.now().value());
var sunrise_moment = sc.calculate(now, lat.toDouble(), lon.toDouble(), SUNRISE);
@@ -549,18 +551,16 @@ class SnapshotWatchView extends Ui.WatchFace {
ampm = "a";
if (timeInfoSunrise.hour >= 12)
{ ampm = "p"; }
-
- timeString = Lang.format("$1$:$2$$3$", [to12hourFormat(timeInfoSunrise.hour), timeInfoSunrise.min.format("%02d"), ampm]);
- dc.drawText(3, height_screen/2 - 14, Gfx.FONT_SMALL, timeString, Gfx.TEXT_JUSTIFY_LEFT|Graphics.TEXT_JUSTIFY_VCENTER);
+ timeStringRise = Lang.format("$1$:$2$$3$", [to12hourFormat(timeInfoSunrise.hour), timeInfoSunrise.min.format("%02d"), ampm]);
ampm = "a";
if (timeInfoSunset.hour >= 12)
{ ampm = "p"; }
-
- timeString = Lang.format("$1$:$2$$3$", [to12hourFormat(timeInfoSunset.hour), timeInfoSunset.min.format("%02d"), ampm]);
- dc.drawText(3, height_screen/2 + 11, Gfx.FONT_SMALL, timeString, Gfx.TEXT_JUSTIFY_LEFT|Graphics.TEXT_JUSTIFY_VCENTER);
-
+ timeStringSet = Lang.format("$1$:$2$$3$", [to12hourFormat(timeInfoSunset.hour), timeInfoSunset.min.format("%02d"), ampm]);
}
+
+ dc.drawText(3, height_screen/2 - 14, Gfx.FONT_SMALL, timeStringRise, Gfx.TEXT_JUSTIFY_LEFT|Graphics.TEXT_JUSTIFY_VCENTER);
+ dc.drawText(3, height_screen/2 + 11, Gfx.FONT_SMALL, timeStringSet, Gfx.TEXT_JUSTIFY_LEFT|Graphics.TEXT_JUSTIFY_VCENTER);
}