From 7ec2992ca86ec78e699da2272b181b3355bcb342 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 5 Aug 2015 20:50:56 -0400
Subject: [PATCH] TW-1611: soww weirdness

- Thanks to Wim Schuermann.
---
 ChangeLog     | 1 +
 src/Dates.cpp | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c0a2404f9..26402abfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,6 +72,7 @@
 - TW-1600 Filtering "regressions"(?) in task-2.4.3, task-2.4.4 (thanks to Ralph
           Bean).
 - TW-1609 In 'urgency<10', 10 is interpreted as an ID (thanks to Wim Schuermann).
+- TW-1611 soww weirdness (thanks to Wim Schuermann).
 - TW-1612 Spurious whitespace added in task descriptions around certain symbols
           (thanks to Denis Kasak).
 - TW-1615 Japanese translation for Taskwarrior(150513) (thanks to ribbon).
diff --git a/src/Dates.cpp b/src/Dates.cpp
index 26a753b6c..d4ef377b5 100644
--- a/src/Dates.cpp
+++ b/src/Dates.cpp
@@ -335,12 +335,10 @@ bool namedDates (const std::string& name, Variant& value)
   else if (closeEnough ("soww", name, minimum))
   {
     t->tm_hour = t->tm_min = t->tm_sec = 0;
-    int extra = (t->tm_wday - 1) * 86400;
-    if (extra > 0)
-      extra += 7 * 86400;
-
+    int days = (8 - t->tm_wday) % 7;
+    int extra = days * 86400;
     t->tm_isdst = -1;
-    value = Variant (mktime (t) - extra, Variant::type_date);
+    value = Variant (mktime (t) + extra, Variant::type_date);
   }
 
   else if (closeEnough ("eoww", name, minimum))