Merge branch 'master' into 2.4.0

2014-01-15 22:17:30 -05:00
parent 1ac4ff8ac9 00204e0191
commit cd6067a39f
31 changed files with 139 additions and 219 deletions
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -674,7 +674,9 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
    {
      std::string value = findValue (after, "\n  UDA " + col->first + ":");
      if ((task.get (col->first) != value) && (type != "date" ||
-           (task.get (col->first) != Date(value, dateformat).toEpochString ())))
+           (task.get (col->first) != Date (value, dateformat).toEpochString ())) &&
+           (type != "duration" ||
+           (task.get (col->first) != (std::string) OldDuration (value) )))
      {
        if (value != "")
        {