From eb2936c2008f951cf51ebe05eb10860b9bf496f9 Mon Sep 17 00:00:00 2001
From: Riley McGee <mcgeer@mcmaster.ca>
Date: Mon, 28 Nov 2016 10:46:01 -0500
Subject: [PATCH] Help Context opening N times resolved
---
src/Gifitti/Gifitti/Models/GifModel.cs | 2 +-
src/Gifitti/Gifitti/View_Models/MainForm.cs | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/Gifitti/Gifitti/Models/GifModel.cs b/src/Gifitti/Gifitti/Models/GifModel.cs
index ec621e3..05bbab1 100644
--- a/src/Gifitti/Gifitti/Models/GifModel.cs
+++ b/src/Gifitti/Gifitti/Models/GifModel.cs
@@ -190,7 +190,7 @@ namespace Gifitti.Models
{
originalGif.SelectActiveFrame(dimension, index);
//find the frame
- return (Image)originalGif.Clone();
+ return originalGif;
//return a copy of it
}
diff --git a/src/Gifitti/Gifitti/View_Models/MainForm.cs b/src/Gifitti/Gifitti/View_Models/MainForm.cs
index 1a9d5ba..72d87ed 100644
--- a/src/Gifitti/Gifitti/View_Models/MainForm.cs
+++ b/src/Gifitti/Gifitti/View_Models/MainForm.cs
@@ -25,7 +25,7 @@ namespace Gifitti.View_Models
{
#region Fields
GifModel gm;
-
+ HelpContext f2 = new HelpContext();
// GifImage _currentGif; <- used to encapsulate info later
private const int widthBuffer = 20;
private const int heightBuffer = 60;
@@ -300,8 +300,10 @@ namespace Gifitti.View_Models
/// <param name="e"> Event arguments associated with this event. </param>
private void menuOpenHelp(object sender, EventArgs e)
{
- HelpContext f2 = new HelpContext();
- f2.Show();
+ if(f2.IsDisposed)
+ f2 = new HelpContext();
+ if (!f2.Visible)
+ f2.Show();
}
/// <summary>
--
GitLab