Merge pull request #24 from marykravets/mary/improvements

improvements
OpenFlutter · May 5, 2021 · 591d8df · 591d8df
2 parents 4a3047b + eb78da3
commit 591d8df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/src/neeko_fullscreen_player.dart b/lib/src/neeko_fullscreen_player.dart
@@ -295,6 +295,9 @@ class __FullscreenPlayerState extends State<_FullscreenPlayer> {
   }
 
   _pop() {
-    Navigator.of(context).pop();
+    final NavigatorState state = Navigator.of(context);
+    if (state.canPop()) {
+      state.pop();
+    }
   }
 }
diff --git a/lib/src/video_controller_wrapper.dart b/lib/src/video_controller_wrapper.dart
@@ -23,7 +23,7 @@ import 'package:video_player/video_player.dart';
 class VideoControllerWrapper extends ValueNotifier<DataSource> {
   VideoPlayerController get controller => _videoPlayerController;
 
-  List<VideoPlayerController> _controllerPool = [];
+  final List<VideoPlayerController> _controllerPool = [];
 
   VideoPlayerController _videoPlayerController;