Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit 3823fb077f9d · 2025-08-20T20:25:25.000Z
9e62309 Addendum to e869dbf
diff --git a/Client/core/Graphics/CVideoModeManager.cpp b/Client/core/Graphics/CVideoModeManager.cpp
@@ -697,7 +697,7 @@ SString CVideoModeManager::GetCurrentAdapterDeviceName()
     {
         // Ensure null termination for x86 safety
         monitorInfo.szDevice[sizeof(monitorInfo.szDevice) - 1] = '\0';
-        return SString(monitorInfo.szDevice);
+        return std::string(monitorInfo.szDevice);
     }
 
     return "";

Original file line number	Diff line number	Diff line change
`@@ -697,7 +697,7 @@ SString CVideoModeManager::GetCurrentAdapterDeviceName()`
`697`	`697`	`{`
`698`	`698`	`// Ensure null termination for x86 safety`
`699`	`699`	`monitorInfo.szDevice[sizeof(monitorInfo.szDevice) - 1] = '\0';`
`700`		`- return SString(monitorInfo.szDevice);`
	`700`	`+ return std::string(monitorInfo.szDevice);`
`701`	`701`	`}`
`702`	`702`
`703`	`703`	`return "";`