1 files changed, 6 insertions, 4 deletions
diff --git a/lib/main.dart b/lib/main.dart
index a04247b..6310660 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -64,7 +64,7 @@ class MyHomePage extends StatefulWidget {
 }
 
 class _MyHomePageState extends State<MyHomePage> {
-  final List<ScanResult> scanResults = [];
+  List<ScanResult> scanResults = [];
   bool isScanning = false;
 
   ScanResult? selectedDevice;
@@ -91,14 +91,16 @@ class _MyHomePageState extends State<MyHomePage> {
     }
 
     setState(() {
-      scanResults.clear();
+      selectedDevice = null;
+      scanResults = [];
       isScanning = true;
-      setState(() {});
     });
-    var subscription = FlutterBluePlus.onScanResults.listen(
+    var subscription = FlutterBluePlus.scanResults.listen(
       onScanResult,
       onError: (e) => logger.e(e),
     );
+    // should probably use this!
+    FlutterBluePlus.cancelWhenScanComplete(subscription);
 
     // Ehhhh... can't have both
     try {