fix for issue #323

jantje · jantje · commit 9b73673c7219 · 2015-11-06T22:20:29.000+01:00
diff --git a/it.baeyens.arduino.common/src/it/baeyens/arduino/arduino/Serial.java b/it.baeyens.arduino.common/src/it/baeyens/arduino/arduino/Serial.java
@@ -182,6 +182,7 @@ public void connect(int maxTries) {
 			} else {
 			    Common.log(new Status(IStatus.ERROR, ArduinoConst.CORE_PLUGIN_ID, "Error opening serial port " + PortName, e));
 			}
+			return;
 		    } else {
 			try {
 			    Thread.sleep(200);
diff --git a/it.baeyens.arduino.monitor/src/it/baeyens/arduino/monitor/views/SerialMonitor.java b/it.baeyens.arduino.monitor/src/it/baeyens/arduino/monitor/views/SerialMonitor.java
@@ -518,7 +518,7 @@ public boolean PauzePort(String PortName) {
     public void ResumePort(String PortName) {
 	Serial TheSerial = GetSerial(PortName);
 	if (TheSerial != null) {
-	    TheSerial.connect(5);
+	    TheSerial.connect(15);
 	}
     }
 

Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,7 @@ public void connect(int maxTries) {`
`182`	`182`	`} else {`
`183`	`183`	`Common.log(new Status(IStatus.ERROR, ArduinoConst.CORE_PLUGIN_ID, "Error opening serial port " + PortName, e));`
`184`	`184`	`}`
	`185`	`+ return;`
`185`	`186`	`} else {`
`186`	`187`	`try {`
`187`	`188`	`Thread.sleep(200);`
Original file line number	Diff line number	Diff line change
`@@ -518,7 +518,7 @@ public boolean PauzePort(String PortName) {`
`518`	`518`	`public void ResumePort(String PortName) {`
`519`	`519`	`Serial TheSerial = GetSerial(PortName);`
`520`	`520`	`if (TheSerial != null) {`
`521`		`- TheSerial.connect(5);`
	`521`	`+ TheSerial.connect(15);`
`522`	`522`	`}`
`523`	`523`	`}`
`524`	`524`