Merge pull request #40 from modio/bugfix_loaddll

Fixed crash when using the plugin in BP-only mode
modio · Nov 16, 2020 · 6cd74c4 · 6cd74c4
2 parents 46d7aa1 + 6330156
commit 6cd74c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Source/modio/Private/ModioModule.cpp b/Source/modio/Private/ModioModule.cpp
@@ -84,8 +84,9 @@ void FModioModule::StartupModule()
   // Load the DLL on windows
 #if PLATFORM_WINDOWS
   FString DllPath = IPluginManager::Get().FindPlugin("Modio")->GetBaseDir();
-  DllPath.Append("/Source/ThirdParty/mod.io-sdk/bin/win64/modio.dll");
+  DllPath.Append("/Source/ThirdParty/mod.io-sdk/bin/msvc/x64/modio.dll");
   DLLHandle = FPlatformProcess::GetDllHandle(*DllPath);
+  check(DLLHandle); // This should only happen in our testing environment the path the dll has changed
 #endif
 
   const UModioSettings *Settings = GetDefault<UModioSettings>();
@@ -113,7 +114,7 @@ void FModioModule::ShutdownModule()
   }
 
 #if PLATFORM_WINDOWS
-  if (DLLHandle != NULL)
+  if (DLLHandle != nullptr)
   {
     FPlatformProcess::FreeDllHandle(DLLHandle);
   }
@@ -144,7 +145,6 @@ bool FModioModule::HandleSettingsSaved()
     Settings->SaveConfig();
   }
 
-  UE_LOG(LogTemp, Log, TEXT("Settings->bIsLiveEnvironment = %s"), Settings->bIsLiveEnvironment ? TEXT("TRUE") : TEXT("FALSE") );
   ModioImp = FModioSubsystem::Create(Settings->RootDirectory, Settings->bRootDirectoryIsInUserSettingsDirectory, Settings->GameId, Settings->ApiKey, Settings->bIsLiveEnvironment, Settings->bInstallOnModDownload, Settings->bRetrieveModsFromOtherGames, Settings->bEnablePolling);
 
   return true;

diff --git a/Source/modio/Public/ModioModule.h b/Source/modio/Public/ModioModule.h
@@ -22,6 +22,6 @@ class FModioModule : public IModuleInterface
 
   FModioSubsystemPtr ModioImp;
 #if PLATFORM_WINDOWS
-  void* DLLHandle;
+  void* DLLHandle = nullptr;
  #endif
 };