diff --git a/BizHawk.Client.EmuHawk/CustomControls/TasListView.cs b/BizHawk.Client.EmuHawk/CustomControls/TasListView.cs
index 920f8fe8bd..b0100d6d88 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/TasListView.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/TasListView.cs
@@ -51,6 +51,11 @@ namespace BizHawk.Client.EmuHawk
public bool InputPaintingMode { get; set; }
public bool IsPaintDown { get; private set; }
+ ///
+ /// Calculates the column name and row number that the point (x, y) lies in.
+ ///
+ /// X coordinate
+ /// Y coordinate
private void CalculatePointedCell(int x, int y)
{
int? newRow;
@@ -69,7 +74,7 @@ namespace BizHawk.Client.EmuHawk
break;
}
- var rowHeight = this.LineHeight + 5; // 5 and 6 work here for me, but are they always dependable, how can I get the padding?
+ var rowHeight = this.LineHeight;// 5 (in VirtualListView) and 6 work here for me, but are they always dependable, how can I get the padding?
var headerHeight = rowHeight + 6;
newRow = ((y - headerHeight) / rowHeight) + this.VScrollPos;
diff --git a/BizHawk.Client.EmuHawk/CustomControls/VirtualListView.cs b/BizHawk.Client.EmuHawk/CustomControls/VirtualListView.cs
index 043df6608d..fe7c122d6f 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/VirtualListView.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/VirtualListView.cs
@@ -444,7 +444,7 @@ namespace BizHawk.Client.EmuHawk
SetStyle(ControlStyles.Opaque, true);
SetStyle(ControlStyles.AllPaintingInWmPaint, true);
- var LineHeight = this.Font.Height + 5;
+ LineHeight = this.Font.Height + 5;
}
~VirtualListView()
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 73d687dd9f..34af24cfa8 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -2515,7 +2515,7 @@ namespace BizHawk.Client.EmuHawk
bool isRewinding = false;
if (Global.Rewinder.RewindActive && (Global.ClientControls["Rewind"] || PressRewind)
- && !Global.MovieSession.Movie.IsRecording) // Rewind isn't "bulletproof" and can desync a recoridng movie!
+ && !Global.MovieSession.Movie.IsRecording) // Rewind isn't "bulletproof" and can desync a recording movie!
{
Global.Rewinder.Rewind(1);
suppressCaptureRewind = true;
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs
index 57e23c67c2..a515386195 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs
@@ -13,7 +13,7 @@
public void StopMovie()
{
this.Focus();
- NewTasMenuItem_Click(null, null);
+ //NewTasMenuItem_Click(null, null);
}
}
}
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index cf4eb78b7b..349232f956 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -195,7 +195,7 @@ namespace BizHawk.Client.EmuHawk
if (TasView.PointedCell.Column == MarkerColumnName)
{
_startMarkerDrag = true;
- GoToFrame(TasView.PointedCell.Row.Value - 1);
+ GoToFrame(TasView.PointedCell.Row.Value);
}
else if (TasView.PointedCell.Column == FrameColumnName)
{