Merge branch 'patch' into dev

sabianroberts · sabianroberts · commit 958c2a5e22a6 · 2025-12-11T00:29:15.000Z
diff --git a/cl_dll/gameui/gameui_viewport.cpp b/cl_dll/gameui/gameui_viewport.cpp
@@ -369,10 +369,10 @@ void CGameUIViewport::LoadWorkshopItems(bool bWorkshopFolder)
 	g_pFullFileSystem->FindClose(fh);
 }
 
-void CGameUIViewport::AutoMountWorkshopItem(vgui2::WorkshopItem WorkshopFile)
+void CGameUIViewport::AutoMountWorkshopItem(vgui2::WorkshopItem &WorkshopFile)
 {
 	if (!WorkshopIDIsMounted(WorkshopFile.uWorkshopID)) return;
-	MountWorkshopItem(WorkshopFile, nullptr, nullptr);
+	WorkshopFile.bMounted = true;
 }
 
 struct CopyPath
diff --git a/cl_dll/gameui/gameui_viewport.h b/cl_dll/gameui/gameui_viewport.h
@@ -55,7 +55,7 @@ class CGameUIViewport : public vgui2::EditablePanel
 	bool IsVACBanned() const;
 
 	void GetCurrentItems(std::vector<vgui2::WorkshopItem>& items);
-	void AutoMountWorkshopItem(vgui2::WorkshopItem WorkshopFile);
+	void AutoMountWorkshopItem(vgui2::WorkshopItem &WorkshopFile);
 	void MountWorkshopItem(vgui2::WorkshopItem WorkshopFile, const char* szPath, const char* szRootPath);
 	bool HasConflictingFiles(vgui2::WorkshopItem WorkshopFile);
 	vgui2::WorkshopItem GetWorkshopItem(PublishedFileId_t nWorkshopID);

Original file line number	Diff line number	Diff line change
`@@ -369,10 +369,10 @@ void CGameUIViewport::LoadWorkshopItems(bool bWorkshopFolder)`
`369`	`369`	`g_pFullFileSystem->FindClose(fh);`
`370`	`370`	`}`
`371`	`371`
`372`		`-void CGameUIViewport::AutoMountWorkshopItem(vgui2::WorkshopItem WorkshopFile)`
	`372`	`+void CGameUIViewport::AutoMountWorkshopItem(vgui2::WorkshopItem &WorkshopFile)`
`373`	`373`	`{`
`374`	`374`	`if (!WorkshopIDIsMounted(WorkshopFile.uWorkshopID)) return;`
`375`		`- MountWorkshopItem(WorkshopFile, nullptr, nullptr);`
	`375`	`+ WorkshopFile.bMounted = true;`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`struct CopyPath`