From c81bb3e50eebd7a59b643e63e0eab8b8f5be9624 Mon Sep 17 00:00:00 2001 From: jdpurcell Date: Sun, 4 Jan 2015 18:22:17 +0000 Subject: [PATCH] Little cleanup (extension method for BeginInvoke). --- BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs | 10 ++++++++-- BizHawk.Client.EmuHawk/MainForm.cs | 5 +---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs b/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs index 360bfb4e84..f0314abfb1 100644 --- a/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs +++ b/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs @@ -32,9 +32,15 @@ namespace BizHawk.Client.EmuHawk.WinFormExtensions } // extension method to make Control.Invoke easier to use - public static void Invoke(this Control control, Action action) + public static object Invoke(this Control control, Action action) { - control.Invoke(action); + return control.Invoke(action); + } + + // extension method to make Control.BeginInvoke easier to use + public static IAsyncResult BeginInvoke(this Control control, Action action) + { + return control.BeginInvoke(action); } public static void AddColumn(this ListView listView, string columnName, bool enabled, int columnWidth) diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 20d36acfbe..7654514740 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -70,10 +70,7 @@ namespace BizHawk.Client.EmuHawk UpdateChecker.CheckComplete += (s2, e2) => { if (IsDisposed) return; - BeginInvoke((MethodInvoker)(() => - { - UpdateNotification.Visible = UpdateChecker.IsNewVersionAvailable; - })); + this.BeginInvoke(() => { UpdateNotification.Visible = UpdateChecker.IsNewVersionAvailable; }); }; UpdateChecker.BeginCheck(); // Won't actually check unless enabled by user }