Merge branch 'master' of https://git.oftal.dk/munia

Conflicts:
	src/task_proto.cc

Fixed conflict.

2 files changed, 2 insertions, 2 deletions

diff --git a/src/msgparser.cc b/src/msgparser.cc
index 70c71c6..c6f83d5 100644
--- a/src/msgparser.cc
+++ b/src/msgparser.cc
@@ -88,7 +88,7 @@ MsgVector parse_msg(std::string data) {
   std::string token;
   bool inside_quote = false;
   char prev_ch = '0';
-  for(int i = 0; i < data.length(); i++) {
+  for(size_t i = 0; i < data.length(); i++) {
     char ch = data[i];
   
     switch(ch) {
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;