fix some appmsg issues

1 files changed, 7 insertions, 3 deletions

diff --git a/daemon/watchconnector.cpp b/daemon/watchconnector.cpp
index dd95821..baec52c 100644
--- a/daemon/watchconnector.cpp
+++ b/daemon/watchconnector.cpp
@@ -109,13 +109,17 @@ bool WatchConnector::dispatchMessage(uint endpoint, const QByteArray &data)
     if (tmp_it != tmpHandlers.end()) {
         QList<EndpointHandlerFunc>& funcs = tmp_it.value();
         bool ok = false;
-        if (!funcs.empty()) {
-            if (funcs.first()(data)) {
+        for (int i = 0; i < funcs.size(); i++) {
+            if (funcs[i](data)) {
+                // This handler accepted this message
                 ok = true;
-                funcs.removeFirst();
+                // Since it is a temporary handler, remove it.
+                funcs.removeAt(i);
+                break;
             }
         }
         if (funcs.empty()) {
+            // "Garbage collect" the tmpHandlers entry.
             tmpHandlers.erase(tmp_it);
         }
         if (ok) {