Merge pull request #389 from lamarios/fix/not_going_back_after_video_…

…autoplay fix issue when video autoplay is enabled, it would not browse back to…
lamarios · Nov 30, 2023 · 9dbe1ef · 9dbe1ef
2 parents 3c4b99c + 674af8b
commit 9dbe1ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/videos/states/video.dart b/lib/videos/states/video.dart
@@ -43,9 +43,6 @@ class VideoCubit extends Cubit<VideoState> {
 
       getDownloadStatus();
 
-      if (settings.state.autoplayVideoOnLoad) {
-        playVideo(false);
-      }
     } catch (err) {
       var state = this.state.copyWith();
       if (err is InvidiousServiceError) {

diff --git a/lib/videos/views/screens/video.dart b/lib/videos/views/screens/video.dart
@@ -80,7 +80,12 @@ class VideoScreen extends StatelessWidget {
             create: (BuildContext context) =>
                 VideoCubit(VideoState(videoId: videoId), downloadManager, player, settings)),
       ],
-      child: BlocBuilder<VideoCubit, VideoState>(
+      child: BlocConsumer<VideoCubit, VideoState>(
+        listenWhen: (previous, current) => settings.state.autoplayVideoOnLoad && previous.video != current.video,
+        listener: (context, state) {
+            AutoRouter.of(context).pop();
+            context.read<VideoCubit>().playVideo(false);
+        },
         builder: (context, _) {
           var cubit = context.read<VideoCubit>();
           var settings = context.read<SettingsCubit>();