Skip to content

Commit 34e5e0d

Browse files
committed
don't throw IllegalStateException if device no longer listed
1 parent 3a39486 commit 34e5e0d

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

src/processing/mode/android/Devices.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,10 +308,15 @@ private void addDevice(final Device device) {
308308

309309

310310
void deviceRemoved(final Device device) {
311-
// System.err.println("AndroidEnvironment: removing " + device.getId());
312-
if (devices.remove(device.getId()) == null) {
313-
throw new IllegalStateException("I didn't know about device "
314-
+ device.getId() + "!");
311+
String id = device.getId();
312+
if (devices.containsKey(id)) {
313+
devices.remove(device.getId());
314+
} else {
315+
// TODO: Device already removed, don't throw exception as this seems to
316+
// happen quite often when removing a device, perhaps shutdown() gets
317+
// called twice?
318+
// throw new IllegalStateException("I didn't know about device "
319+
// + device.getId() + "!");
315320
}
316321
}
317322

0 commit comments

Comments
 (0)