diff options
| author | Jonas Suhr Christensen <jsc@umbraculum.org> | 2012-05-18 10:31:40 +0200 |
|---|---|---|
| committer | Jonas Suhr Christensen <jsc@umbraculum.org> | 2012-05-18 10:31:40 +0200 |
| commit | 89ccf8e281aacb6dac7f6c530d4673144b9bbed9 (patch) | |
| tree | bc502939e4875647e430664c58fd036779de5a0f | |
| parent | 523701245d2cc34de627b1f2579561822f899deb (diff) | |
Fixed id in collapse code.
| -rw-r--r-- | src/munia_proto.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/munia_proto.cc b/src/munia_proto.cc index 7e63d73..480ba39 100644 --- a/src/munia_proto.cc +++ b/src/munia_proto.cc @@ -117,8 +117,9 @@ int callback_lws_task(struct libwebsocket_context * context, while(j != msgqueue[wsi].end()) { message_t m = *j; if(m.cmd == cmd::create && // msg was a create msg? - // create with same ids as we just removed? - msg.remove.id == m.create.id && msg.tid == m.tid) { + // created with same ids as we just removed? + msg.remove.id == m.create.id && + msg.tid == m.tid) { break; } j++; @@ -127,7 +128,7 @@ int callback_lws_task(struct libwebsocket_context * context, // collapse into move msg if(j != msgqueue[wsi].end()) { taskid_t id = j->create.id; - taskid_t parentid = j->create.id; + taskid_t parentid = j->create.parentid; msgqueue[wsi].erase(j); // erase create msg msg.cmd = cmd::move; msg.move.id = id; @@ -137,7 +138,6 @@ int callback_lws_task(struct libwebsocket_context * context, i++; } - std::string msgstr; msgstr.append((size_t)LWS_SEND_BUFFER_PRE_PADDING, ' '); |