[Scummvm-git-logs] scummvm master -> 6ac9d4e2d717f3602331d57fbc65a87a31a11e05

[whoozle]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
6ac9d4e2d7 PHOENIXVR: Unify history between V1/V2


Commit: 6ac9d4e2d717f3602331d57fbc65a87a31a11e05
    https://github.com/scummvm/scummvm/commit/6ac9d4e2d717f3602331d57fbc65a87a31a11e05
Author: Vladimir Menshakov (vladimir.menshakov at gmail.com)
Date: 2026-07-23T00:11:07+01:00

Commit Message:
PHOENIXVR: Unify history between V1/V2

Changed paths:
    engines/phoenixvr/commands_v2.cpp
    engines/phoenixvr/phoenixvr.cpp


diff --git a/engines/phoenixvr/commands_v2.cpp b/engines/phoenixvr/commands_v2.cpp
index f9cfdee05e3..4220ddec1f8 100644
--- a/engines/phoenixvr/commands_v2.cpp
+++ b/engines/phoenixvr/commands_v2.cpp
@@ -101,7 +101,7 @@ struct Goto_Warp : public Command {
 	Common::String name;
 	Goto_Warp(const Common::Array<Common::String> &args) : name(args[0]) {}
 	void exec(ExecutionContext &ctx) const override {
-		if (g_engine->goToWarp(name))
+		if (g_engine->goToWarp(name, true))
 			ctx.running = false;
 	}
 };
diff --git a/engines/phoenixvr/phoenixvr.cpp b/engines/phoenixvr/phoenixvr.cpp
index 8f18b18d3cb..9690c36bbb4 100644
--- a/engines/phoenixvr/phoenixvr.cpp
+++ b/engines/phoenixvr/phoenixvr.cpp
@@ -802,14 +802,15 @@ bool PhoenixVREngine::goToWarp(const Common::String &warp, bool savePrev) {
 	_messengerInventoryHover = -1;
 	if (savePrev) {
 		assert(_warpIdx >= 0);
-		_prevWarp = _warpIdx;
-		saveThumbnail();
-	}
-	if (version() == 2) {
-		if (_warpIdx >= 0)
-			_prevWarpHistory.push_back(_warpIdx);
-		if (_prevWarpHistory.size() > 10)
-			_prevWarpHistory.pop_front();
+		if (version() >= 2) {
+			if (_warpIdx >= 0)
+				_prevWarpHistory.push_back(_warpIdx);
+			if (_prevWarpHistory.size() > 10)
+				_prevWarpHistory.pop_front();
+		} else {
+			_prevWarp = _warpIdx;
+			saveThumbnail();
+		}
 	}
 	return true;
 }