tastudio:
- fix escape handling - frame advance doesn't unpause emu when seek frame is reached
This commit is contained in:
parent
b0893bdee8
commit
f94b352765
|
@ -2687,6 +2687,8 @@ namespace BizHawk.Client.EmuHawk
|
||||||
runFrame = true;
|
runFrame = true;
|
||||||
_runloopFrameadvance = true;
|
_runloopFrameadvance = true;
|
||||||
_frameAdvanceTimestamp = currentTimestamp;
|
_frameAdvanceTimestamp = currentTimestamp;
|
||||||
|
if (GlobalWin.Tools.IsLoaded<TAStudio>())
|
||||||
|
GlobalWin.Tools.TAStudio.IgnoreSeekFrame = false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -937,6 +937,18 @@ namespace BizHawk.Client.EmuHawk
|
||||||
{
|
{
|
||||||
GoToNextMarker();
|
GoToNextMarker();
|
||||||
}
|
}
|
||||||
|
else if (e.KeyCode == Keys.Escape)
|
||||||
|
{
|
||||||
|
if (_floatEditRow != -1)
|
||||||
|
{
|
||||||
|
_floatEditRow = -1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// not using StopSeeking() here, since it has special logic and should only happen when seek frame is reached
|
||||||
|
CancelSeekContextMenuItem_Click(null, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// SuuperW: Float Editing
|
// SuuperW: Float Editing
|
||||||
if (_floatEditRow != -1)
|
if (_floatEditRow != -1)
|
||||||
|
@ -1034,11 +1046,6 @@ namespace BizHawk.Client.EmuHawk
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
// not using StopSeeking() here, since it has special logic and should only happen when seek frame is reashed
|
|
||||||
CancelSeekContextMenuItem_Click(null, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
RefreshDialog();
|
RefreshDialog();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue