mirror of
https://github.com/ShareX/ShareX.git
synced 2024-08-15 10:12:12 +12:00
Merge branch 'master' of github.com:ShareX/ShareX
This commit is contained in:
commit
335f6a1041
2 changed files with 9 additions and 7 deletions
|
@ -338,15 +338,15 @@ private void cbCustomCommands_CheckedChanged(object sender, EventArgs e)
|
||||||
Options.FFmpeg.UseCustomCommands = cbCustomCommands.Checked;
|
Options.FFmpeg.UseCustomCommands = cbCustomCommands.Checked;
|
||||||
txtCommandLinePreview.ReadOnly = !Options.FFmpeg.UseCustomCommands;
|
txtCommandLinePreview.ReadOnly = !Options.FFmpeg.UseCustomCommands;
|
||||||
|
|
||||||
if (!Options.FFmpeg.UseCustomCommands)
|
txtCommandLinePreview.Text = Options.FFmpeg.UseCustomCommands ? Options.FFmpeg.CustomCommands : Options.GetFFmpegCommands();
|
||||||
{
|
|
||||||
txtCommandLinePreview.Text = Options.GetFFmpegCommands();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void txtCommandLinePreview_TextChanged(object sender, EventArgs e)
|
private void txtCommandLinePreview_TextChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
Options.FFmpeg.CustomCommands = txtCommandLinePreview.Text;
|
if (cbCustomCommands.Checked)
|
||||||
|
{
|
||||||
|
Options.FFmpeg.CustomCommands = txtCommandLinePreview.Text;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -76,8 +76,10 @@ public string GetFFmpegCommands()
|
||||||
|
|
||||||
return commands;
|
return commands;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
return GetFFmpegArgs();
|
{
|
||||||
|
return GetFFmpegArgs();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private string GetFFmpegArgs()
|
private string GetFFmpegArgs()
|
||||||
|
|
Loading…
Reference in a new issue