2 files changed, 8 insertions, 12 deletions

diff --git a/testing/Makefile.inc b/testing/Makefile.inc
index b3912033..ab452a94 100644
--- a/testing/Makefile.inc
+++ b/testing/Makefile.inc
@@ -10,10 +10,12 @@ nTox_CFLAGS =           $(LIBSODIUM_CFLAGS) \
                         $(NCURSES_CFLAGS)
 
 nTox_LDADD =            $(LIBSODIUM_LDFLAGS) \
-                                                $(NAC_LDFLAGS) \
+                        $(NAC_LDFLAGS) \
                         libtoxcore.la \
                         $(LIBSODIUM_LIBS) \
+                        $(NACL_OBJECTS) \
                         $(NACL_LIBS) \
+                        $(MATH_LDFLAGS) \
                         $(NCURSES_LIBS) \
                         $(WINSOCK2_LIBS)
 endif
@@ -51,6 +53,7 @@ Messenger_test_LDADD =  $(LIBSODIUM_LDFLAGS) \
                         $(LIBSODIUM_LIBS) \
                         $(NACL_OBJECTS) \
                         $(NACL_LIBS) \
+                        $(MATH_LDFLAGS) \
                         $(WINSOCK2_LIBS)
 
 
@@ -85,6 +88,7 @@ tox_sync_LDADD =        $(LIBSODIUM_LDFLAGS) \
                         $(LIBSODIUM_LIBS) \
                         $(NACL_OBJECTS) \
                         $(NACL_LIBS) \
+                        $(MATH_LDFLAGS) \
                         $(WINSOCK2_LIBS)
 endif
 
diff --git a/testing/nTox.c b/testing/nTox.c
index 7af3124d..83561716 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -542,6 +542,7 @@ void line_eval(Tox *m, char *line)
         } else if (inpt_command == 'q') { //exit
             save_data(m);
             endwin();
+            tox_kill(m);
             exit(EXIT_SUCCESS);
         } else if (inpt_command == 'c') { //set conversation partner
             if (line[2] == 'r') {
@@ -1274,17 +1275,8 @@ int main(int argc, char *argv[])
             }
         }
 
-        if (numfilesenders > 0)
-            // during file transfer wasting cpu cycles is almost unavoidable
-            c_sleep(1);
-        else {
-            if (pollok && (tox_wait_prepare(m, data) == 1)) {
-                /* 250ms is more than fast enough in "regular" mode */
-                tox_wait_execute(data, 0, 100000);
-                tox_wait_cleanup(m, data);
-            } else
-                c_sleep(25);
-        }
+
+        c_sleep(tox_do_run_interval(m));
 
         send_filesenders(m);
         tox_do(m);