From 9a1951c8408547a830cbd7496845dc4e5cdd871c Mon Sep 17 00:00:00 2001
From: Madghostek <madghostek@gmail.com>
Date: Mon, 27 Jul 2020 20:47:29 +0200
Subject: [PATCH] Fix again...

Previous commit caused some issues
---
 tasinput_plugin/src/DefDI.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/tasinput_plugin/src/DefDI.cpp b/tasinput_plugin/src/DefDI.cpp
index f0028e02..5e3c21c4 100755
--- a/tasinput_plugin/src/DefDI.cpp
+++ b/tasinput_plugin/src/DefDI.cpp
@@ -796,17 +796,12 @@ void Status::GetKeys(BUTTONS * Keys)
 	overrideAllowed = true;
 	if (comboTask != C_PAUSE)
 	{
-		if (copyButtons)
-		{
-			ControllerInput.X_AXIS = overrideX;
-			ControllerInput.Y_AXIS = overrideY;
-		}
+		if (!copyButtons) SetKeys(ControllerInput); //don't overwrite after switching to read write
+		else LastControllerInput = ControllerInput;
 		copyButtons = false;
-		SetKeys(ControllerInput); 
 	}
 	ControllerInput.X_AXIS = overrideX;
 	ControllerInput.Y_AXIS = overrideY;
-
 	//Pass Button Info to Emulator
 	Keys->Value = ControllerInput.Value;
 	buttonOverride.Value = oldOverride;
@@ -827,7 +822,7 @@ void Status::GetKeys(BUTTONS * Keys)
 
 void Status::SetKeys(BUTTONS ControllerInput)
 {
-	if (copyButtons)
+	if (copyButtons) //copy m64 data to current input
 	{
 		buttonOverride.Value = ControllerInput.Value;
 		buttonOverride.X_AXIS = buttonOverride.Y_AXIS = 0;