From 81dbafe405147d6feea7ea87b58ff1999542fdb6 Mon Sep 17 00:00:00 2001
From: Sour <mesenemu@gmail.com>
Date: Sat, 1 Feb 2020 12:39:12 -0500
Subject: [PATCH] UI: Fixed key select screen being shown behind current form
 when option to display window on top is enabled

---
 GUI.NET/Forms/Config/BaseInputConfigControl.cs | 2 +-
 GUI.NET/Forms/Config/ctrlEmulatorShortcuts.cs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/GUI.NET/Forms/Config/BaseInputConfigControl.cs b/GUI.NET/Forms/Config/BaseInputConfigControl.cs
index 3479f9eb..8fa7f0b5 100644
--- a/GUI.NET/Forms/Config/BaseInputConfigControl.cs
+++ b/GUI.NET/Forms/Config/BaseInputConfigControl.cs
@@ -69,7 +69,7 @@ namespace Mesen.GUI.Forms.Config
 		protected void btnMapping_Click(object sender, EventArgs e)
 		{
 			using(frmGetKey frm = new frmGetKey(true)) {
-				frm.ShowDialog();
+				((Form)frm).ShowDialog(this);
 				((Button)sender).Text = frm.ShortcutKey.ToString();
 				((Button)sender).Tag = frm.ShortcutKey.Key1;
 			}
diff --git a/GUI.NET/Forms/Config/ctrlEmulatorShortcuts.cs b/GUI.NET/Forms/Config/ctrlEmulatorShortcuts.cs
index e95f4783..a747588a 100644
--- a/GUI.NET/Forms/Config/ctrlEmulatorShortcuts.cs
+++ b/GUI.NET/Forms/Config/ctrlEmulatorShortcuts.cs
@@ -219,7 +219,7 @@ namespace Mesen.GUI.Forms.Config
 						CheckConflicts();
 					} else if(e.Button == MouseButtons.Left) {
 						using(frmGetKey frm = new frmGetKey(false)) {
-							frm.ShowDialog();
+							((Form)frm).ShowDialog(this);
 							button.Value = frm.ShortcutKey.ToString();
 							button.Tag = frm.ShortcutKey;