Better account-based wait status

src/Views.cpp

@@ -96,7 +96,8 @@ std::vector<TaskInfo> buildTasks(const Database& db, std::time_t now) {
                 accountWait = found->second;
             }
         }
-        info.status = StatusUtil::resolve(info.storedStatus, accountWait, now);
+        info.overridesWait = row.waitOverride && accountWait && StatusUtil::followsAccountWait(info.storedStatus.kind);
+        info.status = StatusUtil::resolve(info.storedStatus, info.overridesWait ? std::nullopt : accountWait, now);
         tasks.push_back(info);
     }