CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-08-15 18:22:04 +12:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:ShareX/ShareX

Browse source
This commit is contained in:
Jaex 2014-06-04 14:53:55 +03:00
commit 335f6a1041
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ScreenCaptureLib/Screencast/FFmpegOptionsForm.cs
View file

@ -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)
{
if (cbCustomCommands.Checked)
{ {
Options.FFmpeg.CustomCommands = txtCommandLinePreview.Text; Options.FFmpeg.CustomCommands = txtCommandLinePreview.Text;
} }
} }
} }
}

4
ScreenCaptureLib/Screencast/ScreencastOptions.cs
View file

@ -76,9 +76,11 @@ public string GetFFmpegCommands()
return commands; return commands;
} }
else
{
return GetFFmpegArgs(); return GetFFmpegArgs();
} }
}
private string GetFFmpegArgs() private string GetFFmpegArgs()
{ {