fix WaitForResponse (without timeout)

[proxmark3-svn] / client / proxgui.cpp

diff --git a/client/proxgui.cpp b/client/proxgui.cpp
index 6e4ec98e9f6880d6fcd75ed81b035f50ea904d39..18749158c1110f7e0bc6031f558b6d5baff6f61f 100644 (file)
--- a/client/proxgui.cpp
+++ b/client/proxgui.cpp
@@ -11,15 +11,11 @@
 #include "proxgui.h"
 #include "proxguiqt.h"
 #include "proxmark3.h"
 #include "proxgui.h"
 #include "proxguiqt.h"
 #include "proxmark3.h"

-#include "uart.h"

 
 static ProxGuiQT *gui = NULL;
 static WorkerThread *main_loop_thread = NULL;
 
 
 static ProxGuiQT *gui = NULL;
 static WorkerThread *main_loop_thread = NULL;
 

-WorkerThread::WorkerThread(char *script_cmds_file, char *script_cmd,
-                           bool usb_present, serial_port* sp)
-       : script_cmds_file(script_cmds_file), script_cmd(script_cmd),
-         usb_present(usb_present), sp(sp)
+WorkerThread::WorkerThread(char *script_cmds_file, char *script_cmd, bool usb_present) : script_cmds_file(script_cmds_file), script_cmd(script_cmd), usb_present(usb_present)

 {
 }
 
 {
 }
 


@@ -28,7 +24,7 @@ WorkerThread::~WorkerThread()
 }
 
 void WorkerThread::run() {
 }
 
 void WorkerThread::run() {

-       main_loop(script_cmds_file, script_cmd, usb_present, sp);
+       main_loop(script_cmds_file, script_cmd, usb_present);

 }
 
 extern "C" void ShowGraphWindow(void)
 }
 
 extern "C" void ShowGraphWindow(void)


@@ -63,19 +59,14 @@ extern "C" void MainGraphics(void)
        gui->MainLoop();
 }
 
        gui->MainLoop();
 }
 

-extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file,
-                             char *script_cmd, bool usb_present,
-                             serial_port* sp)
+extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file, char *script_cmd, bool usb_present)

 {
 #ifdef Q_WS_X11
 {
 #ifdef Q_WS_X11

-       bool useGUI = getenv("DISPLAY") != 0;
-#else
-       bool useGUI = true;
-#endif
-       if (!useGUI)
+       if (getenv("DISPLAY") == NULL)

                return;
                return;

+#endif

 
 

-       main_loop_thread = new WorkerThread(script_cmds_file, script_cmd, usb_present, sp);
+       main_loop_thread = new WorkerThread(script_cmds_file, script_cmd, usb_present);

        gui = new ProxGuiQT(argc, argv, main_loop_thread);
 }
 
        gui = new ProxGuiQT(argc, argv, main_loop_thread);
 }