Merge branch 'maverick' into develop

Compile under OSX
2016-01-26 09:48:11 +01:00
parent f0021db2ff cdb9a8fba2
commit 5e597e2d10
46 changed files with 174 additions and 194 deletions
--- a/protocol.c
+++ b/protocol.c
@ -149,13 +149,12 @@ void DeleteProtocol(void *self)
  if (pOld->version) {
    free(pOld->version);
  }
-  if (pOld->pProList) {
-    i = 0;
-    while (NULL != pOld->pProList[i]) {
+  i = 0;
+  while (NULL != pOld->pProList[i]) {
      free(pOld->pProList[i]);
      i++;
-    }
  }
+
  free(pOld);
 }