Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into testing

3 files changed, 5 insertions, 5 deletions

diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index abbc278e..f2a2e95e 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -8,11 +8,10 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_test.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testclient.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testserver.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Messenger_test.cmake)
+
 if(WIN32)
         include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake)
-endif()
-
-if(NOT WIN32)
+else()
         include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake)
         add_subdirectory(toxic)
 endif()
diff --git a/testing/nTox.c b/testing/nTox.c
index 072c17e3..ec597bc3 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -428,7 +428,9 @@ int main(int argc, char *argv[])
     }
 
     for(i = 0; i < argc; i++) {
-        if(argv[i][0] == '-') {
+      if (argv[i] == NULL){
+        break;
+      } else if(argv[i][0] == '-') {
             if(argv[i][1] == 'h') {
                 print_help();
                 exit(0);
diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c
index eb297f7c..2c1f1072 100644
--- a/testing/toxic/chat.c
+++ b/testing/toxic/chat.c
@@ -265,6 +265,5 @@ ToxWindow new_chat(int friendnum) {
   x->friendnum = friendnum;
 
   ret.x = (void*) x;
-  free(x);
   return ret;
 }