From 3a98460fbd79b7649fd7d52cdc7c68e526ca8fc2 Mon Sep 17 00:00:00 2001 From: zeromus Date: Mon, 22 May 2017 12:49:45 -0500 Subject: [PATCH] add path to "loaded config" and "saved config" messages. Fix problems where keybindings arent automatically applied when loading a configfile. Fixes #851 --- BizHawk.Client.EmuHawk/MainForm.Events.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index ef48c584fc..0c2dbee8a5 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -1304,7 +1304,8 @@ namespace BizHawk.Client.EmuHawk { Global.Config = ConfigService.Load(PathManager.DefaultIniPath); Global.Config.ResolveDefaults(); - GlobalWin.OSD.AddMessage("Config file loaded"); + InitControls(); //rebind hotkeys + GlobalWin.OSD.AddMessage("Config file loaded: " + PathManager.DefaultIniPath); } private void LoadConfigFromMenuItem_Click(object sender, EventArgs e) @@ -1322,7 +1323,8 @@ namespace BizHawk.Client.EmuHawk { Global.Config = ConfigService.Load(ofd.FileName); Global.Config.ResolveDefaults(); - GlobalWin.OSD.AddMessage("Config file loaded"); + InitControls(); //rebind hotkeys + GlobalWin.OSD.AddMessage("Config file loaded: " + ofd.FileName); } }