diff options
| author | Jonas Suhr Christensen <jsc@umbraculum.org> | 2012-03-03 09:42:28 +0100 |
|---|---|---|
| committer | Jonas Suhr Christensen <jsc@umbraculum.org> | 2012-03-03 09:42:28 +0100 |
| commit | 3f048887a4bd12eb7d3ecd972560e2cdfef57405 (patch) | |
| tree | 01001596ca46d4d1786f00556d4635201a2dfb18 /src/task_proto.cc | |
| parent | bdbe7ab02d91634f2a35b652151f567c86b0318b (diff) | |
| parent | 27c945b501562d8261eddf8dc7754ea9c2d1f502 (diff) | |
Merge branch 'master' of https://git.oftal.dk/munia
Conflicts:
src/task_proto.cc
Fixed conflict.
Diffstat (limited to 'src/task_proto.cc')
| -rw-r--r-- | src/task_proto.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/task_proto.cc b/src/task_proto.cc index 9ed515e..8516e1c 100644 --- a/src/task_proto.cc +++ b/src/task_proto.cc @@ -238,7 +238,7 @@ int callback_lws_task(struct libwebsocket_context * context, task_t moved_task; for(it = tasklist.begin(); it != tasklist.end(); it++) { task_t &t = *it; - if(it->id == m.move.id) { + if(t.id == m.move.id) { id_found = true; t.x = x; t.y = m.move.y; |