Test for null instead of enforcing non-null

flutter · Feb 4, 2021 · ac243a0 · ac243a0
1 parent f04ec41
commit ac243a0
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/packages/camera/camera_platform_interface/lib/src/method_channel/method_channel_camera.dart b/packages/camera/camera_platform_interface/lib/src/method_channel/method_channel_camera.dart
@@ -131,15 +131,16 @@ class MethodChannelCamera extends CameraPlatform {
 
   @override
   Future<void> dispose(int cameraId) async {
+    if (_channels.containsKey(cameraId)) {
+      final cameraChannel = _channels[cameraId];
+      cameraChannel?.setMethodCallHandler(null);
+      _channels.remove(cameraId);
+    }
+
     await _channel.invokeMethod<void>(
       'dispose',
       <String, dynamic>{'cameraId': cameraId},
     );
-
-    if (_channels.containsKey(cameraId)) {
-      _channels[cameraId]!.setMethodCallHandler(null);
-      _channels.remove(cameraId);
-    }
   }
 
   @override