fix: Null assignment on events loading

bluecherrydvr · Jul 10, 2024 · 4240ddd · 4240ddd
1 parent a9c4c60
commit 4240ddd
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/providers/events_provider.dart b/lib/providers/events_provider.dart
@@ -144,6 +144,9 @@ extension EventsScreenProvider on EventsProvider {
     loadedEvents = LoadedEvents();
     _notify();
 
+    startDate ??= this.startDate;
+    endDate ??= this.endDate;
+
     // Load the events at the same time
     await Future.wait(ServersProvider.instance.servers.map((server) async {
       if (!server.online || server.devices.isEmpty) return;
@@ -158,8 +161,8 @@ extension EventsScreenProvider on EventsProvider {
         await Future.wait(allowedDevices.map((device) async {
           final iterable = (await API.instance.getEvents(
             server,
-            startTime: (startDate ?? this.startDate)?.toUtc(),
-            endTime: (endDate ?? this.startDate)?.toUtc(),
+            startTime: startDate?.toUtc(),
+            endTime: endDate?.toUtc(),
             device: device,
           ))
               .toList()