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

"EBU stl" now only prompt for settings in "Save as..." - thx Debora :)

Browse Source
This commit is contained in:
Nikolaj Olsson 2016-12-08 18:47:59 +01:00
parent 4a4bd6f060
commit be61777aa7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -14,6 +14,7 @@
* Updated Bulgarian Translation - thx Maknol
* Language auto-detect now includes Latvian and Lithuanian - thx rhazor
* Added "Custom text format" in "Batch convert" - thx Chamallow
* "EBU stl" now only prompt for settings in "Save as..." - thx Debora
* FIXED:
* Fixed libre office spell checking urls - thx Massaguana
* Fixed possible crash when generating scene changes - thx Leemet

7
src/Forms/Main.cs
View File

@ -99,6 +99,7 @@ namespace Nikse.SubtitleEdit.Forms
private string _textAutoSaveOriginal;
private StringBuilder _statusLog = new StringBuilder();
private bool _makeHistoryPaused;
private bool _saveAsCalled;
private CheckForUpdatesHelper _checkForUpdatesHelper;
private Timer _timerCheckForUpdates;
@ -3238,6 +3239,7 @@ namespace Nikse.SubtitleEdit.Forms
}
ReloadFromSourceView();
_saveAsCalled = false;
SaveSubtitle(GetCurrentSubtitleFormat());
}
@ -3315,7 +3317,7 @@ namespace Nikse.SubtitleEdit.Forms
_fileName = _fileName.Substring(0, _fileName.Length - 1);
_fileName += format.Extension;
}
_saveAsCalled = true;
if (SaveSubtitle(format) == DialogResult.OK)
{
Configuration.Settings.General.LastSaveAsFormat = format.Name;
@ -3342,7 +3344,7 @@ namespace Nikse.SubtitleEdit.Forms
var ebu = format as Ebu;
if (ebu != null)
{
if (ebu.Save(_fileName, sub))
if (ebu.Save(_fileName, sub, !_saveAsCalled))
{
Configuration.Settings.RecentFiles.Add(_fileName, FirstVisibleIndex, FirstSelectedIndex, _videoFileName, _subtitleAlternateFileName, Configuration.Settings.General.CurrentVideoOffsetInMs);
Configuration.Settings.Save();
@ -4095,6 +4097,7 @@ namespace Nikse.SubtitleEdit.Forms
ReloadFromSourceView();
bool oldChange = _changeSubtitleToString != _subtitle.GetFastHashCode();
_saveAsCalled = false;
SaveSubtitle(GetCurrentSubtitleFormat());
if (_subtitleAlternate != null && _changeAlternateSubtitleToString != _subtitleAlternate.ToText(new SubRip()).Trim() && Configuration.Settings.General.AllowEditOfOriginalSubtitle && _subtitleAlternate.Paragraphs.Count > 0)