History Viewer: Prevent history viewer from being opened before some history exists (prevents crash when trying to use resume gameplay)

Core/Console.cpp

@@ -511,9 +511,9 @@ CheatManager* Console::GetCheatManager()
 	return _cheatManager.get();
 }
 
-RewindManager* Console::GetRewindManager()
+shared_ptr<RewindManager> Console::GetRewindManager()
 {
-	return _rewindManager.get();
+	return _rewindManager;
 }
 
 HistoryViewer* Console::GetHistoryViewer()

Core/Console.h

@@ -129,7 +129,7 @@ public:
 	ControlManager* GetControlManager();
 	MemoryManager* GetMemoryManager();
 	CheatManager* GetCheatManager();
-	RewindManager* GetRewindManager();
+	shared_ptr<RewindManager> GetRewindManager();
 	HistoryViewer* GetHistoryViewer();
 
 	bool LoadMatchingRom(string romName, HashInfo hashInfo);

Core/RewindManager.cpp

@@ -13,6 +13,7 @@ RewindManager::RewindManager(shared_ptr<Console> console)
 	_settings = console->GetSettings();
 	_rewindState = RewindState::Stopped;
 	_framesToFastForward = 0;
+	_hasHistory = false;
 	AddHistoryBlock();
 
 	_console->GetControlManager()->RegisterInputProvider(this);
@@ -27,6 +28,7 @@ RewindManager::~RewindManager()
 
 void RewindManager::ClearBuffer()
 {
+	_hasHistory = false;
 	_history.clear();
 	_historyBackup.clear();
 	_currentHistory = RewindData();
@@ -42,6 +44,7 @@ void RewindManager::ClearBuffer()
 void RewindManager::ProcessNotification(ConsoleNotificationType type, void * parameter)
 {
 	if(type == ConsoleNotificationType::PpuFrameDone) {
+		_hasHistory = _history.size() >= 2;
 		if(_settings->GetRewindBufferSize() > 0) {
 			switch(_rewindState) {
 				case RewindState::Starting:
@@ -338,6 +341,11 @@ void RewindManager::RewindSeconds(uint32_t seconds)
 	}
 }
 
+bool RewindManager::HasHistory()
+{
+	return _hasHistory;
+}
+
 void RewindManager::CopyHistory(shared_ptr<HistoryViewer> destHistoryViewer)
 {
 	destHistoryViewer->SetHistoryData(_history);

Core/RewindManager.h

@@ -25,6 +25,8 @@ private:
 
 	shared_ptr<Console> _console;
 	EmulationSettings* _settings;
+	
+	bool _hasHistory;
 
 	std::deque<RewindData> _history;
 	std::deque<RewindData> _historyBackup;
@@ -66,6 +68,7 @@ public:
 	bool IsStepBack();
 	void RewindSeconds(uint32_t seconds);
 
+	bool HasHistory();
 	void CopyHistory(shared_ptr<HistoryViewer> destHistoryViewer);
 
 	void SendFrame(void *frameBuffer, uint32_t width, uint32_t height, bool forRewind);

Core/ShortcutKeyHandler.cpp

@@ -204,7 +204,7 @@ void ShortcutKeyHandler::CheckMappedKeys()
 	}
 
 	if(!isNetplayClient && !MovieManager::Recording() && !settings->CheckFlag(NsfPlayerEnabled)) {
-		RewindManager* rewindManager = _console->GetRewindManager();
+		shared_ptr<RewindManager> rewindManager = _console->GetRewindManager();
 		if(rewindManager) {
 			if(DetectKeyPress(EmulatorShortcut::ToggleRewind)) {
 				if(rewindManager->IsRewinding()) {

Core/SoundMixer.cpp

@@ -125,7 +125,7 @@ void SoundMixer::PlayAudioBuffer(uint32_t time)
 		}
 	}
 
-	RewindManager* rewindManager = _console->GetRewindManager();
+	shared_ptr<RewindManager> rewindManager = _console->GetRewindManager();
 
 	if(!_console->GetVideoRenderer()->IsRecording() && !_waveRecorder && !_settings->CheckFlag(EmulationFlags::NsfPlayerEnabled)) {
 		if((_settings->CheckFlag(EmulationFlags::Turbo) || (rewindManager && rewindManager->IsRewinding())) && _settings->CheckFlag(EmulationFlags::ReduceSoundInFastForward)) {

GUI.NET/Forms/frmMain.cs

@@ -1090,7 +1090,7 @@ namespace Mesen.GUI.Forms
 					mnuStopMovie.Enabled = running && !netPlay && (moviePlaying || movieRecording);
 					mnuRecordMovie.Enabled = running && !moviePlaying && !movieRecording && !isNetPlayClient;
 					mnuGameConfig.Enabled = !moviePlaying && !movieRecording;
-					mnuHistoryViewer.Enabled = running && !InteropEmu.IsNsf() && ConfigManager.Config.PreferenceInfo.RewindBufferSize > 0;
+					mnuHistoryViewer.Enabled = running && !InteropEmu.IsNsf() && InteropEmu.HistoryViewerEnabled();
 
 					bool waveRecording = InteropEmu.WaveIsRecording();
 					mnuWaveRecord.Enabled = running && !waveRecording;

GUI.NET/InteropEmu.cs

@@ -26,6 +26,7 @@ namespace Mesen.GUI
 		[DllImport(DLLPath)] public static extern void InitializeDualSystem(IntPtr windowHandle, IntPtr viewerHandle);
 		[DllImport(DLLPath)] public static extern void ReleaseDualSystemAudioVideo();
 
+		[DllImport(DLLPath)] [return: MarshalAs(UnmanagedType.I1)] public static extern bool HistoryViewerEnabled();
 		[DllImport(DLLPath)] public static extern void HistoryViewerInitialize(IntPtr windowHandle, IntPtr viewerHandle);
 		[DllImport(DLLPath)] public static extern void HistoryViewerRelease();
 		[DllImport(DLLPath)] public static extern void HistoryViewerRun();

InteropDLL/ConsoleWrapper.cpp

@@ -31,6 +31,7 @@
 #include "../Core/VsSystemActionManager.h"
 #include "../Core/KeyManager.h"
 #include "../Core/GameDatabase.h"
+#include "../Core/RewindManager.h"
 #include "../Utilities/SimpleLock.h"
 
 #ifdef _WIN32
@@ -190,6 +191,12 @@ namespace InteropEmu {
 			_console->Resume();
 		}
 
+		DllExport bool __stdcall HistoryViewerEnabled()
+		{
+			shared_ptr<RewindManager> rewindManager = _console->GetRewindManager();
+			return rewindManager ? rewindManager->HasHistory() : false;
+		}
+
 		DllExport void __stdcall HistoryViewerInitialize(void *windowHandle, void *viewerHandle)
 		{
 			_historyConsole.reset(new Console(nullptr, _settings));