Merge branch 'master' into 2.4.0

This commit is contained in:
Paul Beckingham 2014-01-15 22:17:30 -05:00
commit cd6067a39f
31 changed files with 139 additions and 219 deletions

View file

@ -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 != "")
{