Merge pull request #1828 from ivandrofly/importtext-2

[ImportText ] - Update/Refact
This commit is contained in:
Nikolaj Olsson 2016-07-04 19:39:36 +02:00 committed by GitHub
commit 50be7c7705

View File

@ -122,15 +122,9 @@ namespace Nikse.SubtitleEdit.Forms
} }
if (_refreshTimer.Enabled) if (_refreshTimer.Enabled)
{
_refreshTimer.Stop(); _refreshTimer.Stop();
_refreshTimer.Start(); _refreshTimer.Start();
} }
else
{
_refreshTimer.Start();
}
}
private void GeneratePreviewReal() private void GeneratePreviewReal()
{ {
@ -260,8 +254,7 @@ namespace Nikse.SubtitleEdit.Forms
{ {
p.EndTime.TotalMilliseconds = millisecondsIndex + p.Duration.TotalMilliseconds; p.EndTime.TotalMilliseconds = millisecondsIndex + p.Duration.TotalMilliseconds;
p.StartTime.TotalMilliseconds = millisecondsIndex; p.StartTime.TotalMilliseconds = millisecondsIndex;
millisecondsIndex += (p.EndTime.TotalMilliseconds - p.StartTime.TotalMilliseconds) + millisecondsInterval;
millisecondsIndex += p.Duration.TotalMilliseconds + millisecondsInterval;
} }
} }