Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 15:02:35 +01:00
Code Issues Projects Releases Wiki Activity

Minor fix for "default save format"

Browse Source
This commit is contained in:
Nikolaj Olsson 2021-05-08 10:45:25 +02:00
parent 63243c4f84
commit 01b6e9c1b3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ui/Forms/Main.cs
View File

@ -102,6 +102,7 @@ namespace Nikse.SubtitleEdit.Forms
private int _subtitleListViewIndex = -1; private int _subtitleListViewIndex = -1;
private Paragraph _oldSelectedParagraph; private Paragraph _oldSelectedParagraph;
private bool _converted; private bool _converted;
private bool _formatManuallyChanged;
private SubtitleFormat _oldSubtitleFormat; private SubtitleFormat _oldSubtitleFormat;
private List<int> _selectedIndices; private List<int> _selectedIndices;
private LanguageStructure.Main _language; private LanguageStructure.Main _language;
@ -2430,6 +2431,7 @@ namespace Nikse.SubtitleEdit.Forms
_lastAutoSave = DateTime.UtcNow.Ticks; _lastAutoSave = DateTime.UtcNow.Ticks;
bool videoFileLoaded = false; bool videoFileLoaded = false;
_formatManuallyChanged = false;
var file = new FileInfo(fileName); var file = new FileInfo(fileName);
var ext = file.Extension.ToLowerInvariant(); var ext = file.Extension.ToLowerInvariant();
@ -4143,7 +4145,7 @@ namespace Nikse.SubtitleEdit.Forms
{ {
if (string.IsNullOrEmpty(_fileName) || _converted) if (string.IsNullOrEmpty(_fileName) || _converted)
{ {
return FileSaveAs(false); return FileSaveAs(_converted && !_formatManuallyChanged);
} }
try try
@ -4169,6 +4171,7 @@ namespace Nikse.SubtitleEdit.Forms
} }
_oldSubtitleFormat = format; _oldSubtitleFormat = format;
_formatManuallyChanged = false;
return DialogResult.OK; return DialogResult.OK;
} }
@ -4340,6 +4343,7 @@ namespace Nikse.SubtitleEdit.Forms
new BookmarkPersistence(_subtitle, _fileName).Save(); new BookmarkPersistence(_subtitle, _fileName).Save();
_fileDateTime = File.GetLastWriteTime(_fileName); _fileDateTime = File.GetLastWriteTime(_fileName);
_oldSubtitleFormat = format; _oldSubtitleFormat = format;
_formatManuallyChanged = false;
ShowStatus(string.Format(_language.SavedSubtitleX, _fileName)); ShowStatus(string.Format(_language.SavedSubtitleX, _fileName));
if (formatType == typeof(NetflixTimedText)) if (formatType == typeof(NetflixTimedText))
{ {
@ -30023,6 +30027,7 @@ namespace Nikse.SubtitleEdit.Forms
if (_oldSubtitleFormat == null || _oldSubtitleFormat.FriendlyName != GetCurrentSubtitleFormat().FriendlyName) if (_oldSubtitleFormat == null || _oldSubtitleFormat.FriendlyName != GetCurrentSubtitleFormat().FriendlyName)
{ {
ComboBoxSubtitleFormatsSelectedIndexChanged(sender, e); ComboBoxSubtitleFormatsSelectedIndexChanged(sender, e);
_formatManuallyChanged = true;
} }
} }