Merge branch 'fix'

lib/pages/video/detail/controller.dart

@@ -152,17 +152,13 @@ class VideoDetailController extends GetxController
     defaultAudioQa = setting.get(SettingBoxKey.defaultAudioQa,
         defaultValue: AudioQuality.hiRes.code);
     oid.value = IdUtils.bv2av(Get.parameters['bvid']!);
-    getSubtitle().then(
+    getSubtitle();
-      (subtitles) {
+    headerControl = HeaderControl(
-        headerControl = HeaderControl(
+      controller: plPlayerController,
-          controller: plPlayerController,
+      videoDetailCtr: this,
-          videoDetailCtr: this,
+      floating: floating,
-          floating: floating,
+      bvid: bvid,
-          bvid: bvid,
+      videoType: videoType,
-          videoType: videoType,
-          showSubtitleBtn: subtitles.isNotEmpty,
-        );
-      },
     );
   }
 
@@ -439,9 +435,6 @@ class VideoDetailController extends GetxController
         subtitles = result['data'].subtitles;
         getDanmaku(subtitles);
       }
-      return subtitles;
-    } else {
-      return [];
     }
   }
 

lib/pages/video/detail/widgets/header_control.dart

@@ -1329,7 +1329,7 @@ class _HeaderControlState extends State<HeaderControl> {
           ],
 
           /// 字幕
-          if (widget.showSubtitleBtn!)
+          if (widget.showSubtitleBtn ?? true)
             ComBtn(
               icon: const Icon(
                 Icons.closed_caption_off,