Skip to content

Commit 88fd31d

Browse files
committed
Fix for #360
1 parent 2d92d3c commit 88fd31d

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

it.baeyens.arduino.core/src/it/baeyens/arduino/actions/OpenSerialMonitorHandler.java

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,21 @@ private static int getBaudRate(IProject iProject) {
9898
}
9999

100100
IIndexName[] names = index.findNames(setupFunc, org.eclipse.cdt.core.index.IIndex.FIND_DEFINITIONS);
101-
if (names.length != 1) {
102-
return -3;
103-
}
104-
105-
String SetupFileName = names[0].getFileLocation().getFileName();
106-
String SetupFileContent = FileUtils.readFileToString(new File(SetupFileName));
107-
int serialBeginStart = SetupFileContent.indexOf(serialVariable);
108-
if (serialBeginStart != -1) {
109-
int serialBeginStartbraket = SetupFileContent.indexOf("(", serialBeginStart); //$NON-NLS-1$
110-
if (serialBeginStartbraket != -1) {
111-
int serialBeginCloseBraket = SetupFileContent.indexOf(")", serialBeginStartbraket); //$NON-NLS-1$
112-
if (serialBeginCloseBraket != -1) {
113-
String baudrate = SetupFileContent.substring(serialBeginStartbraket + 1, serialBeginCloseBraket).trim();
114-
return Integer.parseInt(baudrate);
101+
// if (names.length != 1) {
102+
// return -3;
103+
// }
104+
for (IIndexName name : names) {
105+
String SetupFileName = name.getFileLocation().getFileName();
106+
String SetupFileContent = FileUtils.readFileToString(new File(SetupFileName));
107+
int serialBeginStart = SetupFileContent.indexOf(serialVariable);
108+
if (serialBeginStart != -1) {
109+
int serialBeginStartbraket = SetupFileContent.indexOf("(", serialBeginStart); //$NON-NLS-1$
110+
if (serialBeginStartbraket != -1) {
111+
int serialBeginCloseBraket = SetupFileContent.indexOf(")", serialBeginStartbraket); //$NON-NLS-1$
112+
if (serialBeginCloseBraket != -1) {
113+
String baudrate = SetupFileContent.substring(serialBeginStartbraket + 1, serialBeginCloseBraket).trim();
114+
return Integer.parseInt(baudrate);
115+
}
115116
}
116117
}
117118
}

it.baeyens.arduino.monitor/src/it/baeyens/arduino/monitor/views/SerialMonitor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ public void dispose() {
164164
entry.getKey().dispose();
165165
}
166166
this.mySerialConnections.clear();
167+
me = null;
167168
}
168169

169170
/**

0 commit comments

Comments
 (0)