Skip to content

Commit f41cf1d

Browse files
committed
fix reconnection bug
1 parent 670afc0 commit f41cf1d

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

src/gui.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,11 @@ impl MyApp {
525525
if !devices.contains(&self.device) {
526526
self.device.clear();
527527
}
528-
528+
if let Ok(dev) = self.device_lock.read() {
529+
if !dev.name.is_empty() {
530+
self.device = dev.name.clone();
531+
}
532+
}
529533
ui.add_space(10.0);
530534
ui.horizontal(|ui| {
531535
ui.label("Device");

src/serial.rs

+5
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,12 @@ fn get_device(
197197
*write_guard = devices.clone();
198198
}
199199

200+
// do reconnect
200201
if devices.contains(&last_connected_device.name) {
202+
if let Ok(mut device) = device_lock.write() {
203+
device.name = last_connected_device.name.clone();
204+
device.baud_rate = last_connected_device.baud_rate;
205+
}
201206
return last_connected_device.clone();
202207
}
203208

0 commit comments

Comments
 (0)