Fixes invalid wait operations for gui

Change-Id: Id5c0105e484925bc56c5b1f0f561a69314bf8087

diff --git a/src/batch/BatchRunner.cpp b/src/batch/BatchRunner.cpp
index be6c2ce..33a64a4 100644 (file)
--- a/src/batch/BatchRunner.cpp
+++ b/src/batch/BatchRunner.cpp
@@ -525,7 +525,7 @@ public:
        {
                if (name.empty()) {
                        auto h = self->contextInfo.lock();
-                       name = h->rootName;
+                       this->name = h->rootName;
                        searchForAnyChange = true;
                } else {
                        this->name = std::move(name);
@@ -536,10 +536,11 @@ private:
        bool predicate() override
        {
                auto h = self->contextInfo.lock();
-               auto res = h.waitForCondition(timeout, [&]() {
+               auto pred = [&]() {
                        return (searchForAnyChange && name != h->rootName) || (!searchForAnyChange && name == h->rootName);
-               });
-
+               };
+               if (pred()) return true;
+               auto res = h.waitForCondition(timeout, pred);
                if (!res) {
                        throw EvaluationFailure{} << "wait for gui ('" << name << "'): operation timeouted, " <<
                                                                          "current root name is '" << h->rootName << "'";

diff --git a/src/batch/EvaluationValue.hpp b/src/batch/EvaluationValue.hpp
index fe2064d..3dcecc8 100644 (file)
--- a/src/batch/EvaluationValue.hpp
+++ b/src/batch/EvaluationValue.hpp
@@ -288,7 +288,6 @@ namespace detail
                                const std::vector<EvaluationValue> &defaultArguments,
                                size_t consumeOnlyArguments = std::numeric_limits<size_t>::max())
                {
-                       DEBUG("%d %d", (int)I, (int)consumeOnlyArguments);
                        if (I >= consumeOnlyArguments) return;
                        try {
                                auto &s = I < sourceArgs.size() ? sourceArgs[I] : defaultArguments[I - firstDefaultArgIndex];