diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59699a7dd..849326e5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
### Changed
- mosaic layout: clamp ratio to 32/9
+- Video: disable subtitles by default
## [v1.9.6] - 2023-09-25
diff --git a/lib/model/entry/entry.dart b/lib/model/entry/entry.dart
index 1c7075143..a58d369b2 100644
--- a/lib/model/entry/entry.dart
+++ b/lib/model/entry/entry.dart
@@ -331,6 +331,7 @@ class AvesEntry with AvesEntryBase {
String? _bestTitle;
+ @override
String? get bestTitle {
_bestTitle ??= _catalogMetadata?.xmpTitle?.isNotEmpty == true ? _catalogMetadata!.xmpTitle : (filenameWithoutExtension ?? sourceTitle);
return _bestTitle;
diff --git a/lib/model/entry/extensions/info.dart b/lib/model/entry/extensions/info.dart
index 6aa21abd3..115a5bb9f 100644
--- a/lib/model/entry/extensions/info.dart
+++ b/lib/model/entry/extensions/info.dart
@@ -72,6 +72,9 @@ extension ExtraAvesEntryInfo on AvesEntry {
Future> _getStreamDirectories(BuildContext context) async {
final directories = [];
final mediaInfo = await videoMetadataFetcher.getMetadata(this);
+ if (!context.mounted) {
+ return directories;
+ }
final formattedMediaTags = VideoMetadataFormatter.formatInfo(mediaInfo);
if (formattedMediaTags.isNotEmpty) {
diff --git a/lib/widgets/viewer/action/video_action_delegate.dart b/lib/widgets/viewer/action/video_action_delegate.dart
index 739e79bb1..847fd0cf7 100644
--- a/lib/widgets/viewer/action/video_action_delegate.dart
+++ b/lib/widgets/viewer/action/video_action_delegate.dart
@@ -140,12 +140,15 @@ class VideoActionDelegate with FeedbackMixin, PermissionAwareMixin, SizeAwareMix
Future _showStreamSelectionDialog(BuildContext context, AvesVideoController controller) async {
final streams = controller.streams;
final currentSelectedStreams = await Future.wait(MediaStreamType.values.map(controller.getSelectedStream));
- final currentSelectedIndices = currentSelectedStreams.whereNotNull().map((v) => v.index).toSet();
final userSelectedStreams = await showDialog