From 1abc4144eec60a0542f52f46f045a5878e24fbce Mon Sep 17 00:00:00 2001
From: merlokk <olegmsn@gmail.com>
Date: Fri, 13 Oct 2017 13:13:13 +0300
Subject: [PATCH] small refactoring

---
 client/proxmark3.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 2de53ea8..678939f4 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -271,15 +271,17 @@ int main(int argc, char* argv[]) {
 	set_my_executable_path();
 	
 	// open uart
-	int openCount = 0;
-	do {
+	if (!waitCOMPort) {
 		sp = uart_open(argv[1]);
-		if (sp != INVALID_SERIAL_PORT && sp != CLAIMED_SERIAL_PORT)
-			break;
-		msleep(1000);
-		printf(".");
-	} while(waitCOMPort && (++openCount < 20));
-	printf("\n");
+	} else {
+		int openCount = 0;
+		do {
+			sp = uart_open(argv[1]);
+			msleep(1000);
+			printf(".");
+		} while(++openCount < 20 && (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT));
+		printf("\n");
+	}
 
 	// check result of uart opening
 	if (sp == INVALID_SERIAL_PORT) {