X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/9d8f56e35d83e7691f6b018b01342419b7e0360b..28afbd2bee49027d042030bfce07db2db8c7508b:/client/proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index ae4ad7c0..78bc1fe4 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -21,8 +21,8 @@
 #include "proxgui.h"
 #include "cmdmain.h"
 #include "uart.h"
-#include "messages.h"
 #include "ui.h"
+#include "sleep.h"
 
 static serial_port sp;
 static UsbCommand txcmd;
@@ -221,11 +221,16 @@ int main(int argc, char* argv[]) {
     offline = 0;
   }
 */
+  
   sp = uart_open(argv[1]);
   if (sp == INVALID_SERIAL_PORT) {
     printf("ERROR: invalid serial port\n");
     marg.usb_present = 0;
     offline = 1;
+  } else if (sp == CLAIMED_SERIAL_PORT) {
+    printf("ERROR: serial port is claimed by another process\n");
+    marg.usb_present = 0;
+    offline = 1;
   } else {
     marg.usb_present = 1;
     offline = 0;