mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-01 17:56:51 +13:00
Revert "Prevent FFmpeg Custom Commands from getting overwritten"
This reverts commit 4a403fd65f
.
This commit is contained in:
parent
335f6a1041
commit
c1fa7ae07f
2 changed files with 7 additions and 9 deletions
|
@ -338,15 +338,15 @@ private void cbCustomCommands_CheckedChanged(object sender, EventArgs e)
|
|||
Options.FFmpeg.UseCustomCommands = cbCustomCommands.Checked;
|
||||
txtCommandLinePreview.ReadOnly = !Options.FFmpeg.UseCustomCommands;
|
||||
|
||||
txtCommandLinePreview.Text = Options.FFmpeg.UseCustomCommands ? Options.FFmpeg.CustomCommands : Options.GetFFmpegCommands();
|
||||
if (!Options.FFmpeg.UseCustomCommands)
|
||||
{
|
||||
txtCommandLinePreview.Text = Options.GetFFmpegCommands();
|
||||
}
|
||||
}
|
||||
|
||||
private void txtCommandLinePreview_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (cbCustomCommands.Checked)
|
||||
{
|
||||
Options.FFmpeg.CustomCommands = txtCommandLinePreview.Text;
|
||||
}
|
||||
Options.FFmpeg.CustomCommands = txtCommandLinePreview.Text;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -76,10 +76,8 @@ public string GetFFmpegCommands()
|
|||
|
||||
return commands;
|
||||
}
|
||||
else
|
||||
{
|
||||
return GetFFmpegArgs();
|
||||
}
|
||||
|
||||
return GetFFmpegArgs();
|
||||
}
|
||||
|
||||
private string GetFFmpegArgs()
|
||||
|
|
Loading…
Reference in a new issue