Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2025-01-31 21:11:39 +01:00
Code Issues Projects Releases Wiki Activity

Fixed "Video auto-load" a few places - thx Ede123 :)

Browse Source 
Fix #2365
This commit is contained in:
Nikolaj Olsson 2017-05-02 04:58:49 +02:00
parent 2d06a9d271
commit 4f43a84c35
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LanguageMaster.xml
View File

@ -1736,7 +1736,7 @@ can edit in same subtitle file (collaboration)</Information>
<AutoBackupEveryMinute>Every minute</AutoBackupEveryMinute>
<AutoBackupEveryFiveMinutes>Every 5th minute</AutoBackupEveryFiveMinutes>
<AutoBackupEveryFifteenMinutes>Every 15th minute</AutoBackupEveryFifteenMinutes>
<AutoBackupDeleteAfter>Delete backup after</AutoBackupDeleteAfter>
<AutoBackupDeleteAfter>Delete after</AutoBackupDeleteAfter>
<AutoBackupDeleteAfterOneMonth>1 month</AutoBackupDeleteAfterOneMonth>
<AutoBackupDeleteAfterThreeMonths>3 months</AutoBackupDeleteAfterThreeMonths>
<AutoBackupDeleteAfterSixMonths>6 months</AutoBackupDeleteAfterSixMonths>

16
src/Forms/Main.cs
View File

@ -10589,7 +10589,10 @@ namespace Nikse.SubtitleEdit.Forms
Text = Title;
Configuration.Settings.Save();
OpenVideo(fileName);
if (!Configuration.Settings.General.DisableVideoAutoLoading)
{
OpenVideo(fileName);
}
}
}
return true;
@ -10782,7 +10785,8 @@ namespace Nikse.SubtitleEdit.Forms
if (subtitleChooser.ShowDialog(this) == DialogResult.OK)
{
if (LoadMatroskaSubtitle(subtitleList[subtitleChooser.SelectedIndex], matroska, false) &&
(ext.Equals(".mkv", StringComparison.Ordinal)) || ext.Equals(".mks", StringComparison.Ordinal))
(ext.Equals(".mkv", StringComparison.Ordinal) || ext.Equals(".mks", StringComparison.Ordinal)) &&
!Configuration.Settings.General.DisableVideoAutoLoading)
{
OpenVideo(fileName);
}
@ -10792,7 +10796,8 @@ namespace Nikse.SubtitleEdit.Forms
else
{
if (LoadMatroskaSubtitle(subtitleList[0], matroska, false) &&
(ext.Equals(".mkv", StringComparison.Ordinal) || ext.Equals(".mks", StringComparison.Ordinal)))
(ext.Equals(".mkv", StringComparison.Ordinal) || ext.Equals(".mks", StringComparison.Ordinal)) &&
!Configuration.Settings.General.DisableVideoAutoLoading)
{
OpenVideo(fileName);
}
@ -13425,7 +13430,10 @@ namespace Nikse.SubtitleEdit.Forms
ResetSubtitle();
if (!string.IsNullOrEmpty(importText.VideoFileName))
{
OpenVideo(importText.VideoFileName);
if (!Configuration.Settings.General.DisableVideoAutoLoading)
{
OpenVideo(importText.VideoFileName);
}
_fileName = importText.VideoFileName;
_converted = true;
}