From b56b5bc29d4809762ea8cd5dc62d1df64ddf130f Mon Sep 17 00:00:00 2001 From: Johannes Schlatow Date: Tue, 2 Nov 2010 22:41:38 +0100 Subject: [PATCH] Bug - fixed #526, false warning about wait date, when both are modified simultaneously --- src/command.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/command.cpp b/src/command.cpp index 4a0058ddf..edb5e3f7f 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -1669,7 +1669,8 @@ int handleModify (std::string& outs) throw std::string ("You cannot remove the recurrence from a recurring task."); if ((task->has ("wait") && context.task.has ("due") && Date (context.task.get ("due")) < Date (task->get ("wait"))) || - (context.task.has ("wait") && task->has ("due") && Date (task->get ("due")) < Date (context.task.get ("wait"))) || + (context.task.has ("wait") && !context.task.has ("due") && task->has ("due") && Date (task->get ("due")) < Date (context.task.get ("wait"))) || + (context.task.has ("wait") && context.task.has ("due") && Date (context.task.get ("due")) < Date (context.task.get ("wait"))) || (task->has ("wait") && task->has ("due") && Date (task->get ("due")) < Date (task->get ("wait")))) context.footnote ("Warning: the wait date falls after the due date.");