M src/core/thread.c → src/core/thread.c

@@ -107,7 +107,7 @@ struct mCore* core = threadContext->core;
 	core->setSync(core, &threadContext->sync);
 	core->reset(core);
 
-	if (core->opts.rewindEnable) {
+	if (core->opts.rewindEnable && core->opts.rewindBufferCapacity > 0) {
 		 mCoreRewindContextInit(&threadContext->rewind, core->opts.rewindBufferCapacity);
 	}
 
@@ -487,11 +487,13 @@ void mCoreThreadFrameStarted(struct mCoreThread* thread) {
 	if (!thread) {
 		return;
 	}
-	if (thread->core->opts.rewindEnable && thread->state != THREAD_REWINDING) {
-		mCoreRewindAppend(&thread->rewind, thread->core);
-	} else if (thread->state == THREAD_REWINDING) {
-		if (!mCoreRewindRestore(&thread->rewind, thread->core)) {
+	if (thread->core->opts.rewindEnable && thread->core->opts.rewindBufferCapacity > 0) {
+		if (thread->state != THREAD_REWINDING) {
 			mCoreRewindAppend(&thread->rewind, thread->core);
+		} else if (thread->state == THREAD_REWINDING) {
+			if (!mCoreRewindRestore(&thread->rewind, thread->core)) {
+				mCoreRewindAppend(&thread->rewind, thread->core);
+			}
 		}
 	}
 }

M src/platform/qt/GameController.cpp → src/platform/qt/GameController.cpp

@@ -659,11 +659,12 @@
 void GameController::setRewind(bool enable, int capacity) {
 	if (m_gameOpen) {
 		threadInterrupt();
-		if (m_threadContext.core->opts.rewindEnable) {
+		if (m_threadContext.core->opts.rewindEnable && m_threadContext.core->opts.rewindBufferCapacity > 0) {
 			mCoreRewindContextDeinit(&m_threadContext.rewind);
 		}
 		m_threadContext.core->opts.rewindEnable = enable;
-		if (enable) {
+		m_threadContext.core->opts.rewindBufferCapacity = capacity;
+		if (enable && capacity > 0) {
 			mCoreRewindContextInit(&m_threadContext.rewind, capacity);
 		}
 		threadContinue();