Merge branch 'mr-142'

fix(resources): assign m_rootPath if adhesive isn't loaded (mr-142): - 61adf08 fix(resources): assign m_rootPath if adhesive isn't loaded hopefully last edge case i haven't thought about
citizenfx · Nov 6, 2023 · 47f8999 · 47f8999
2 parents 29e01c1 + 61adf08
commit 47f8999
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/code/components/citizen-resources-core/src/Resource.cpp b/code/components/citizen-resources-core/src/Resource.cpp
@@ -17,6 +17,13 @@
 
 #if __has_include(<InternalResourceImpl.h>) && !defined(IS_FXSERVER)
 #include <InternalResourceImpl.h>
+
+inline bool IsAdhesiveLoaded()
+{
+	static HMODULE s_adhesiveHandle = GetModuleHandle(L"adhesive.dll");
+	return s_adhesiveHandle != NULL;
+}
+
 #else
 #define INTERNAL_RESOURCE_GET_NAME GetName
 #endif
@@ -54,6 +61,11 @@ bool ResourceImpl::LoadFrom(const std::string& rootPath, std::string* errorState
 
 #if !defined(INTERNAL_RESOURCE_IMPL)
 	m_rootPath = rootPath;
+#else
+	if (!IsAdhesiveLoaded())
+	{
+		m_rootPath = rootPath;
+	}
 #endif
 
 	m_state = ResourceState::Stopped;