Rewind: Fixed partial desync of input data when rewind stops

This could potentially cause desyncs on subsequent rewinds, but most obviously it caused rewinding during movie playback to break movie playback entirely (because some inputs were handled by the rewind, while others were handled by the movie, causing the _deviceIndex value to be out of sync with its expected value)

Core/Shared/Movies/MesenMovie.cpp

@@ -59,7 +59,12 @@ void MesenMovie::Stop()
 bool MesenMovie::SetInput(BaseControlDevice *device)
 {
 	uint32_t inputRowIndex = _controlManager->GetPollCounter();
-	_lastPollCounter = inputRowIndex;
+
+	if(_lastPollCounter != inputRowIndex) {
+		_lastPollCounter = inputRowIndex;
+		assert(_deviceIndex == 0);
+		_deviceIndex = 0;
+	}
 
 	if(_inputData.size() > inputRowIndex && _inputData[inputRowIndex].size() > _deviceIndex) {
 		device->SetTextState(_inputData[inputRowIndex][_deviceIndex]);

Core/Shared/RewindManager.cpp

@@ -74,7 +74,7 @@ void RewindManager::ProcessNotification(ConsoleNotificationType type, void * par
 					_framesToFastForward--;
 					_currentHistory.FrameCount++;
 					if(_framesToFastForward == 0) {
-						for(int i = 0; i < 4; i++) {
+						for(int i = 0; i < BaseControlDevice::PortCount; i++) {
 							size_t numberToRemove = _currentHistory.InputLogs[i].size();
 							_currentHistory.InputLogs[i] = _historyBackup.front().InputLogs[i];
 							for(size_t j = 0; j < numberToRemove; j++) {
@@ -407,11 +407,15 @@ void RewindManager::RecordInput(vector<shared_ptr<BaseControlDevice>> devices)
 bool RewindManager::SetInput(BaseControlDevice *device)
 {
 	uint8_t port = device->GetPort();
-	if(!_currentHistory.InputLogs[port].empty() && IsRewinding()) {
-		ControlDeviceState state = _currentHistory.InputLogs[port].front();
-		_currentHistory.InputLogs[port].pop_front();
-		device->SetRawState(state);
-		return true;
+	if(IsRewinding()) {
+		if(!_currentHistory.InputLogs[port].empty()) {
+			ControlDeviceState state = _currentHistory.InputLogs[port].front();
+			_currentHistory.InputLogs[port].pop_front();
+			device->SetRawState(state);
+			return true;
+		} else {
+			return false;
+		}
 	} else {
 		return false;
 	}

Core/pch.h

@@ -32,6 +32,7 @@
 #include <thread>
 #include <deque>
 #include <algorithm>
+#include <assert.h>
 
 #include "Utilities/UTF8Util.h"