3 files changed, 12 insertions, 6 deletions

diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index 6bbe00f2..ff7b2fb7 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -21,6 +21,7 @@
 #include "Hud.h"
 #include "Text.h"
 #include "Timer.h"
+#include "Record.h"
 #include "World.h"
 #include "Vehicle.h"
 #include "Ped.h"
@@ -657,9 +658,14 @@ void CPad::Update(int16 unk)
 {
 	OldState = NewState;
 	
-	NewState = ReconcileTwoControllersInput(PCTempKeyState,   PCTempJoyState);
-	NewState = ReconcileTwoControllersInput(PCTempMouseState, NewState);
-	
+#if (defined GTA_PS2 || defined FIX_BUGS)
+	if (!CRecordDataForGame::IsPlayingBack() /* && !CRecordDataForChase::ShouldThisPadBeLeftAlone(unk) */)
+#endif
+	{
+		NewState = ReconcileTwoControllersInput(PCTempKeyState, PCTempJoyState);
+		NewState = ReconcileTwoControllersInput(PCTempMouseState, NewState);
+	}
+
 	PCTempJoyState.Clear();
 	PCTempKeyState.Clear();
 	PCTempMouseState.Clear();
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index 3dcb767a..d00edf51 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -1247,8 +1247,8 @@ CStreaming::StreamVehiclesAndPeds(void)
 	static int timeBeforeNextLoad = 0;
 	static int modelQualityClass = 0;
 
-	if(CRecordDataForGame::RecordingState == RECORDSTATE_1 ||
-	   CRecordDataForGame::RecordingState == RECORDSTATE_2)
+	if(CRecordDataForGame::IsRecording() ||
+	   CRecordDataForGame::IsPlayingBack())
 		return;
 
 	if(FindPlayerPed()->m_pWanted->AreSwatRequired()){
diff --git a/src/core/Timer.cpp b/src/core/Timer.cpp
index 18d6b6a3..3cd6862c 100644
--- a/src/core/Timer.cpp
+++ b/src/core/Timer.cpp
@@ -130,7 +130,7 @@ void CTimer::Update(void)
 
 	ms_fTimeStepNonClipped = ms_fTimeStep;
 	
-	if ( CRecordDataForGame::RecordingState != RECORDSTATE_2 )
+	if ( !CRecordDataForGame::IsPlayingBack() )
 	{
 		ms_fTimeStep = min(3.0f, ms_fTimeStep);