From d69a17b25eeaed1d29d2bfeeabe821f7b28b593e Mon Sep 17 00:00:00 2001 From: zeromus Date: Tue, 8 Sep 2015 15:56:20 -0500 Subject: [PATCH] fix #495 --- BizHawk.Client.EmuHawk/MainForm.Events.cs | 2 +- BizHawk.Client.EmuHawk/MainForm.cs | 7 +++++-- BizHawk.Client.EmuHawk/Throttle.cs | 1 - 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index 9b4eb8fdfe..2d68d2746c 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -678,7 +678,7 @@ namespace BizHawk.Client.EmuHawk DisplayLagCounterMenuItem.Enabled = Global.Emulator.CanPollInput(); DisplayMessagesMenuItem.Checked = Global.Config.DisplayMessages; - } + } private void WindowSizeSubMenu_DropDownOpened(object sender, EventArgs e) { diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 40c457be49..0af5980312 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -1897,9 +1897,12 @@ namespace BizHawk.Client.EmuHawk LoadState(ofd.FileName, Path.GetFileName(ofd.FileName)); } - private static void SaveSlotSelectedMessage() + private void SaveSlotSelectedMessage() { - GlobalWin.OSD.AddMessage("Slot " + Global.Config.SaveSlot + " selected."); + int slot = Global.Config.SaveSlot; + string emptypart = _stateSlots.HasSlot(slot) ? "" : " (empty)"; + string message = string.Format("Slot {0}{1} selected.", slot, emptypart); + GlobalWin.OSD.AddMessage(message); } private void Render() diff --git a/BizHawk.Client.EmuHawk/Throttle.cs b/BizHawk.Client.EmuHawk/Throttle.cs index 09742a0d58..4e56f0f24b 100644 --- a/BizHawk.Client.EmuHawk/Throttle.cs +++ b/BizHawk.Client.EmuHawk/Throttle.cs @@ -99,7 +99,6 @@ namespace BizHawk.Client.EmuHawk if (signal_continuousframeAdvancing) { - int zzz = 9; //dont ever skip frames when continuous frame advancing. it's meant for precision work. //but we DO need to throttle extraThrottle = true;