From dd8638ba06a6fcfa1ae70fd8363a38075aafe18c Mon Sep 17 00:00:00 2001 From: zeromus Date: Thu, 14 Aug 2014 15:51:49 +0000 Subject: [PATCH] improved life cycle management of picturebox images (dont we have some direct substitute for picturebox which doesnt suck so much?) --- .../config/NES/QuickNesConfig.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs b/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs index aaef8cce52..75e65cd190 100644 --- a/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs +++ b/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs @@ -53,9 +53,23 @@ namespace BizHawk.Client.EmuHawk bmp.SetPixel(i, j, col); } } + + if (pictureBox1.Image != null) pictureBox1.Image.Dispose(); pictureBox1.Image = bmp; } + protected override void OnClosed(EventArgs e) + { + base.OnClosed(e); + + if (pictureBox1.Image != null) + { + pictureBox1.Image.Dispose(); + pictureBox1.Image = null; + } + + } + private void buttonPal_Click(object sender, EventArgs e) { OpenFileDialog ofd = new OpenFileDialog