From 47d78650fa3c0585f35ab63704af2f094d7d91c1 Mon Sep 17 00:00:00 2001
From: RecursiveVision <66801010+RecursiveVision@users.noreply.github.com>
Date: Sun, 9 Jun 2024 18:18:32 -0400
Subject: [PATCH] Fix unintended merge

---
 CvGameCoreDLL_Expansion2/CvGame.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CvGameCoreDLL_Expansion2/CvGame.cpp b/CvGameCoreDLL_Expansion2/CvGame.cpp
index 7bfc890207..1228a2a56a 100644
--- a/CvGameCoreDLL_Expansion2/CvGame.cpp
+++ b/CvGameCoreDLL_Expansion2/CvGame.cpp
@@ -6555,7 +6555,7 @@ bool CvGame::CanPlayerAttemptDominationVictory(PlayerTypes ePlayer, PlayerTypes
 					return false;
 
 				// Already at war, but making peace with this player would stop us from eliminating everyone?
-				if (eMakePeacePlayer == kPlayer.GetID())
+				if (eMakePeacePlayer != NO_PLAYER && eMakePeacePlayer == kPlayer.GetID())
 					return false;
 			}
 			else