mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-11-22 03:02:35 +01:00
Retry saving when other program is locking subtitle - thx peter-qgd :)
Fix #5148
This commit is contained in:
parent
8ea4c87d86
commit
4fd7a48d26
@ -4377,23 +4377,26 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
return DialogResult.Cancel;
|
return DialogResult.Cancel;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (comboBoxEncoding.SelectedIndex == TextEncoding.Utf8WithoutBomIndex)
|
Retry.Do(() =>
|
||||||
{
|
{
|
||||||
var outputEnc = new UTF8Encoding(false); // create encoding with no BOM
|
if (comboBoxEncoding.SelectedIndex == TextEncoding.Utf8WithoutBomIndex)
|
||||||
using (var file = new StreamWriter(_fileName, false, outputEnc)) // open file with encoding
|
|
||||||
{
|
{
|
||||||
file.Write(allText);
|
var outputEnc = new UTF8Encoding(false); // create encoding with no BOM
|
||||||
|
using (var file = new StreamWriter(_fileName, false, outputEnc)) // open file with encoding
|
||||||
|
{
|
||||||
|
file.Write(allText);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
else
|
||||||
else
|
|
||||||
{
|
|
||||||
// create file - includes BOM for Unicode formats
|
|
||||||
using (var fs = new FileStream(_fileName, FileMode.Create, FileAccess.Write, FileShare.Read))
|
|
||||||
using (var sw = new StreamWriter(fs, currentEncoding))
|
|
||||||
{
|
{
|
||||||
sw.Write(allText);
|
// create file - includes BOM for Unicode formats
|
||||||
|
using (var fs = new FileStream(_fileName, FileMode.Create, FileAccess.Write, FileShare.Read))
|
||||||
|
using (var sw = new StreamWriter(fs, currentEncoding))
|
||||||
|
{
|
||||||
|
sw.Write(allText);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}, TimeSpan.FromSeconds(1), 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
Configuration.Settings.RecentFiles.Add(_fileName, FirstVisibleIndex, FirstSelectedIndex, VideoFileName, _subtitleOriginalFileName, Configuration.Settings.General.CurrentVideoOffsetInMs);
|
Configuration.Settings.RecentFiles.Add(_fileName, FirstVisibleIndex, FirstSelectedIndex, VideoFileName, _subtitleOriginalFileName, Configuration.Settings.General.CurrentVideoOffsetInMs);
|
||||||
@ -20833,8 +20836,8 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
// ignore
|
// ignore
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_lastFormWindowState = WindowState;
|
_lastFormWindowState = WindowState;
|
||||||
});
|
});
|
||||||
@ -30757,8 +30760,8 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
// Ignore
|
// Ignore
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user