Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit 2b7aa77f4f35 · 2025-09-16T12:52:54.000Z
1c7c721 Fix refresh restarting resources (#4469) f864cf7 Update client en_US pot
diff --git a/Server/mods/deathmatch/logic/CResourceManager.cpp b/Server/mods/deathmatch/logic/CResourceManager.cpp
@@ -184,7 +184,7 @@ bool CResourceManager::Refresh(bool bRefreshAll, const SString strJustThisResour
                 // Add the resource
                 Load(!info.bIsDir, info.strAbsPath, info.strName);
             }
-            else if (pResource && pResource->HasResourceChanged())
+            else if (bRefreshAll && pResource && pResource->HasResourceChanged())
             {
                 if (g_pServerInterface->IsRequestingExit())
                     return false;

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ bool CResourceManager::Refresh(bool bRefreshAll, const SString strJustThisResour`
`184`	`184`	`// Add the resource`
`185`	`185`	`Load(!info.bIsDir, info.strAbsPath, info.strName);`
`186`	`186`	`}`
`187`		`- else if (pResource && pResource->HasResourceChanged())`
	`187`	`+ else if (bRefreshAll && pResource && pResource->HasResourceChanged())`
`188`	`188`	`{`
`189`	`189`	`if (g_pServerInterface->IsRequestingExit())`
`190`	`190`	`return false;`