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

Fix drag'n'drop after translation mode - thx Sopor :)

Browse Source 
Fix #3998
This commit is contained in:
Nikolaj Olsson 2020-02-17 18:39:59 +01:00
parent 117fba4425
commit e4ec93787f
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Forms/Main.cs
View File

@ -12674,6 +12674,7 @@ namespace Nikse.SubtitleEdit.Forms
}
else if (subtitleList.Count > 1)
{
ResetSubtitle();
using (var subtitleChooser = new MatroskaSubtitleChooser("mkv"))
{
subtitleChooser.Initialize(subtitleList);
@ -12694,6 +12695,7 @@ namespace Nikse.SubtitleEdit.Forms
(ext.Equals(".mkv", StringComparison.Ordinal) || ext.Equals(".mks", StringComparison.Ordinal)) &&
!Configuration.Settings.General.DisableVideoAutoLoading)
{
ResetSubtitle();
OpenVideo(fileName);
}
}
@ -12708,12 +12710,14 @@ namespace Nikse.SubtitleEdit.Forms
var mp4SubtitleTracks = mp4Parser.GetSubtitleTracks();
if (mp4SubtitleTracks.Count > 0)
{
ResetSubtitle();
ImportSubtitleFromMp4(fileName);
return;
}
}
else if (ext == ".vob" || ext == ".ifo")
{
ResetSubtitle();
ImportDvdSubtitle(fileName);
return;
}
@ -12722,6 +12726,7 @@ namespace Nikse.SubtitleEdit.Forms
var subFileName = fileName.Substring(0, fileName.Length - 3) + "sub";
if (File.Exists(subFileName) && FileUtil.IsVobSub(subFileName))
{
ResetSubtitle();
ImportAndOcrVobSubSubtitleNew(subFileName, _loading);
return;
}
@ -12729,6 +12734,7 @@ namespace Nikse.SubtitleEdit.Forms
if (file.Length < Subtitle.MaxFileSize)
{
ResetSubtitle();
if (!OpenFromRecentFiles(fileName))
{
OpenSubtitle(fileName, null);
@ -12736,18 +12742,22 @@ namespace Nikse.SubtitleEdit.Forms
}
else if (file.Length < 150000000 && ext == ".sub" && IsVobSubFile(fileName, true)) // max 150 mb
{
ResetSubtitle();
OpenSubtitle(fileName, null);
}
else if (file.Length < 250000000 && ext == ".sup" && FileUtil.IsBluRaySup(fileName)) // max 250 mb
{
ResetSubtitle();
OpenSubtitle(fileName, null);
}
else if ((ext == ".ts" || ext == ".rec" || ext == ".mpg" || ext == ".mpeg") && FileUtil.IsTransportStream(fileName))
{
ResetSubtitle();
OpenSubtitle(fileName, null);
}
else if (ext == ".m2ts" && FileUtil.IsM2TransportStream(fileName))
{
ResetSubtitle();
OpenSubtitle(fileName, null);
}
else