More "Fix common errors" in network mode...

git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1661 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2013-02-21 17:31:36 +00:00
parent c70abba55a
commit 3eb1da2d7a
2 changed files with 4 additions and 12 deletions

View File

@ -16,6 +16,7 @@
* Remembers size of controls in main window better - thx George/Leszek
* Format Sami: html-decodes text + reads class attributes better
* Batch convert can now also "Fix common errors" and more - thx Adem
* Volume level is now remembered (no longer in settings) - thx fox
* FIXED:
* VobSub files created by SE now have better compatibility - thx George
* Possible crash+bug in 'Fix common errors' on selected lines - thx Dan

View File

@ -4234,7 +4234,8 @@ namespace Nikse.SubtitleEdit.Forms
private void FixToolStripMenuItemClick(object sender, EventArgs e)
{
FixCommonErrors(false);
if (_networkSession == null)
FixCommonErrors(false);
}
private void FixCommonErrors(bool onlySelectedLines)
@ -4244,8 +4245,6 @@ namespace Nikse.SubtitleEdit.Forms
ReloadFromSourceView();
SaveSubtitleListviewIndexes();
var fixErrors = new FixCommonErrors();
//_formPositionsAndSizes.SetPositionAndSize(fixErrors);
if (onlySelectedLines)
{
var selectedLines = new Subtitle { WasLoadedWithFrameNumbers = _subtitle.WasLoadedWithFrameNumbers };
@ -4268,6 +4267,7 @@ namespace Nikse.SubtitleEdit.Forms
List<int> deletes = new List<int>();
if (_networkSession != null)
{
_networkSession.TimerStop();
foreach (int index in SubtitleListview1.SelectedIndices)
{
var pOld = _subtitle.Paragraphs[index];
@ -4283,18 +4283,10 @@ namespace Nikse.SubtitleEdit.Forms
}
i++;
}
NetworkGetSendUpdates(new List<int>(), 0, null);
deletes.Reverse();
foreach (int index in deletes)
{
_subtitle.Paragraphs.RemoveAt(index);
}
deletes.Reverse();
NetworkGetSendUpdates(deletes, 0, null);
}
else
{
foreach (int index in SubtitleListview1.SelectedIndices)
{
var pOld = _subtitle.Paragraphs[index];
@ -4328,7 +4320,6 @@ namespace Nikse.SubtitleEdit.Forms
ShowSource();
SubtitleListview1.Fill(_subtitle, _subtitleAlternate);
RestoreSubtitleListviewIndexes();
//_formPositionsAndSizes.SavePositionAndSize(fixErrors);
}
Configuration.Settings.CommonErrors.StartSize = fixErrors.Width + ";" + fixErrors.Height;
Configuration.Settings.CommonErrors.StartPosition = fixErrors.Left + ";" + fixErrors.Top;