From a5b8e2f3467095cacdb5fc66cf8e494ec4a05a4b Mon Sep 17 00:00:00 2001
From: Riley McGee <mcgeer@mcmaster.ca>
Date: Mon, 28 Nov 2016 10:07:52 -0500
Subject: [PATCH] Save As conflict merge
---
src/Gifitti/Gifitti/View_Models/MainForm.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Gifitti/Gifitti/View_Models/MainForm.cs b/src/Gifitti/Gifitti/View_Models/MainForm.cs
index 29dc019..4f0f0ec 100644
--- a/src/Gifitti/Gifitti/View_Models/MainForm.cs
+++ b/src/Gifitti/Gifitti/View_Models/MainForm.cs
@@ -209,8 +209,8 @@ namespace Gifitti.View_Models
/// <param name="e"> Event arguments associated with this event. </param>
private void MenuItemFileSaveAs(object sender, EventArgs e)
{
- TransformGif.saveThePlayback(gm, delay);
- /*if (!chkImage())
+ //TransformGif.saveThePlayback(gm, delay);
+ if (!chkImage())
return;
String path = null;
saveGifFileDialog.Filter = "GIF Files|*.gif";
@@ -227,7 +227,7 @@ namespace Gifitti.View_Models
{
MessageBox.Show("Save Path Invalid!");
}
- */
+
}
#endregion
--
GitLab