empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade: Fixed upgrade issues

Browse source
This commit is contained in:
Sour 2017-12-28 18:30:23 -05:00
parent cd38eed36e
commit 6be4d14834
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
GUI.NET/Forms/frmMain.Help.cs
View file

@ -67,6 +67,9 @@ namespace Mesen.GUI.Forms
ConfigManager.Config.InputInfo.Controllers[0].Keys[0].PachinkoButtons = presets.Pachinko.PachinkoButtons;
ConfigManager.Config.InputInfo.Controllers[0].Keys[0].PartyTapButtons = presets.PartyTap.PartyTapButtons;
ConfigManager.Config.InputInfo.Controllers[0].Keys[0].PowerPadButtons = presets.PowerPad.PowerPadButtons;
if(ConfigManager.Config.InputInfo.Controllers.Count > 1 && ConfigManager.Config.InputInfo.Controllers[1].Keys.Count > 0) {
ConfigManager.Config.InputInfo.Controllers[1].Keys[0].PowerPadButtons = presets.PowerPad.PowerPadButtons;
}
ConfigManager.Config.InputInfo.Controllers[0].Keys[0].SuborKeyboardButtons = presets.SuborKeyboard.SuborKeyboardButtons;
ConfigManager.Config.InputInfo.Controllers[0].Keys[0].BandaiMicrophoneButtons = presets.BandaiMicrophone.BandaiMicrophoneButtons;
}

10
GUI.NET/Forms/frmMain.cs
View file

@ -144,8 +144,6 @@ namespace Mesen.GUI.Forms
mnuTests.Visible = false;
#endif
PerformUpgrade();
_notifListener = new InteropEmu.NotificationListener();
_notifListener.OnNotification += _notifListener_OnNotification;
@ -164,6 +162,8 @@ namespace Mesen.GUI.Forms
UpdateVideoSettings();
InitializeCore();
PerformUpgrade();
InitializeEmu();
TopMost = ConfigManager.Config.PreferenceInfo.AlwaysOnTop;
@ -284,9 +284,13 @@ namespace Mesen.GUI.Forms
this.UpdateMenus();
}
void InitializeEmu()
void InitializeCore()
{
InteropEmu.InitializeEmu(ConfigManager.HomeFolder, this.Handle, ctrlRenderer.Handle, _noAudio, _noVideo, _noInput);
}
void InitializeEmu()
{
if(ConfigManager.Config.PreferenceInfo.OverrideGameFolder && Directory.Exists(ConfigManager.Config.PreferenceInfo.GameFolder)) {
InteropEmu.AddKnownGameFolder(ConfigManager.Config.PreferenceInfo.GameFolder);
}