fix: Remove selected devices that don't exist anymore

In case of device deletion
bluecherrydvr · Oct 1, 2024 · b68cd6b · b68cd6b
1 parent 836831a
commit b68cd6b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/main.dart b/lib/main.dart
@@ -153,11 +153,11 @@ Future<void> main(List<String> args) async {
     // wait time at the splash screen
     // settings provider needs to be initalized alone
     await SettingsProvider.ensureInitialized();
+    await ServersProvider.ensureInitialized();
     await Future.wait([
       DownloadsManager.ensureInitialized(),
       MobileViewProvider.ensureInitialized(),
       DesktopViewProvider.ensureInitialized(),
-      ServersProvider.ensureInitialized(),
       UpdateManager.ensureInitialized(),
       EventsProvider.ensureInitialized(),
     ]);

diff --git a/lib/providers/events_provider.dart b/lib/providers/events_provider.dart
@@ -24,6 +24,7 @@ import 'package:bluecherry_client/providers/app_provider_interface.dart';
 import 'package:bluecherry_client/providers/server_provider.dart';
 import 'package:bluecherry_client/screens/events_browser/filter.dart';
 import 'package:bluecherry_client/utils/constants.dart';
+import 'package:bluecherry_client/utils/extensions.dart';
 import 'package:bluecherry_client/utils/logging.dart';
 import 'package:bluecherry_client/utils/storage.dart';
 import 'package:flutter/foundation.dart';
@@ -133,6 +134,19 @@ class EventsProvider extends UnityProvider {
 
     selectedDevices =
         List<String>.from(data['selectedDevices'] as List).toSet();
+    selectedDevices.removeWhere((device) {
+      final server = ServersProvider.instance.servers.firstWhereOrNull(
+        (server) => server.devices.any((d) => d.streamURL == device),
+      );
+      return server == null ||
+          !server.devices.any((d) {
+            if (d.streamURL == device) {
+              return d.status;
+            } else {
+              return false;
+            }
+          });
+    });
 
     super.restore(notifyListeners: notifyListeners);
   }