Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Commit

Permalink
simplified showErrors
Browse files Browse the repository at this point in the history
  • Loading branch information
red-rj committed Mar 28, 2017
1 parent 7512933 commit 9865c77
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions BlenderRenderController/BlenderRenderController/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@ private void concatenate()
{
Trace.WriteLine(ex);
_log.Error(ex.ToString());
Helper.showErrors(new List<string> { AppErrorCodes.FFMPEG_PATH_NOT_SET });
Helper.showErrors(AppErrorCodes.FFMPEG_PATH_NOT_SET);
settingsForm.ShowDialog();
statusLabel.Text = "Joining cancelled.";
return;
Expand All @@ -860,9 +860,7 @@ private void loadBlend() {
statusLabel.Update();

if ( !File.Exists(p.blendFilePath) ) {
var errors = new List<string>();
errors.Add(AppErrorCodes.BLEND_FILE_NOT_EXISTS);
Helper.showErrors(errors, MessageBoxIcon.Exclamation);
Helper.showErrors(AppErrorCodes.BLEND_FILE_NOT_EXISTS, MessageBoxIcon.Exclamation);

appSettings.recentBlends.Remove(p.blendFilePath);
updateRecentBlendsMenu();
Expand Down Expand Up @@ -899,7 +897,7 @@ private void loadBlend() {
catch( Exception ex ) {
_log.Error(ex.ToString());
Trace.WriteLine(ex);
Helper.showErrors(new List<string> { AppErrorCodes.BLENDER_PATH_NOT_SET });
Helper.showErrors(AppErrorCodes.BLENDER_PATH_NOT_SET );
settingsForm.ShowDialog();
stopRender(false);
return;
Expand Down Expand Up @@ -980,7 +978,7 @@ private void loadBlend() {
//notify we are going to render an image
if (RenderFormats.IMAGES.Contains(p.renderFormat))
{
Helper.showErrors(new List<string> { AppErrorCodes.RENDER_FORMAT_IS_IMAGE }, MessageBoxIcon.Asterisk, p.renderFormat);
Helper.showErrors(AppErrorCodes.RENDER_FORMAT_IS_IMAGE, MessageBoxIcon.Asterisk, p.renderFormat);
}

//FIX RELATIVE RENDER OUTPUT PATHS
Expand Down Expand Up @@ -1109,7 +1107,7 @@ private void mixdown() {
catch (Exception ex)
{
Trace.WriteLine(ex);
Helper.showErrors(new List<string> { AppErrorCodes.FFMPEG_PATH_NOT_SET });
Helper.showErrors(AppErrorCodes.FFMPEG_PATH_NOT_SET);
settingsForm.ShowDialog();
statusLabel.Text = "Mixdown cancelled.";
return;
Expand Down

0 comments on commit 9865c77

Please sign in to comment.