diff --git a/Source/DTFluxProjectSettings/Public/DTFluxGeneralSettings.h b/Source/DTFluxProjectSettings/Public/DTFluxGeneralSettings.h index e7db181..4f8d48b 100644 --- a/Source/DTFluxProjectSettings/Public/DTFluxGeneralSettings.h +++ b/Source/DTFluxProjectSettings/Public/DTFluxGeneralSettings.h @@ -3,12 +3,11 @@ #pragma once #include "CoreMinimal.h" -#include "Assets/DTFluxModelAsset.h" #include "Engine/DeveloperSettings.h" #include "DTFluxGeneralSettings.generated.h" class UAvaRundown; -// class UDTFluxModelAsset; +class UDTFluxModelAsset; /** * */ diff --git a/Source/DTFluxRemote/Private/DTFluxRemoteSubsystem.cpp b/Source/DTFluxRemote/Private/DTFluxRemoteSubsystem.cpp index 4a6ad93..a5d7a87 100644 --- a/Source/DTFluxRemote/Private/DTFluxRemoteSubsystem.cpp +++ b/Source/DTFluxRemote/Private/DTFluxRemoteSubsystem.cpp @@ -375,9 +375,9 @@ void UDTFluxRemoteSubsystem::LoadRundownFromSettings() // Décharger l'ancien rundown d'abord UnloadCurrentRundown(); - + RundownAsset = RundownAsset.LoadSynchronous(); // Charger le nouveau rundown - if (LoadRundown(RundownAsset)) + if ( RundownAsset.IsValid()) { UE_LOG(logDTFluxRemote, Log, TEXT("Successfully loaded rundown from settings: %s"), *RundownAsset.ToString()); } @@ -453,5 +453,5 @@ bool UDTFluxRemoteSubsystem::ProcessCommandData(const FString& JsonString) return false; } -void UDTFluxRemoteSubsystem::LoadRundown + diff --git a/Source/DTFluxRemote/Public/DTFluxRemoteSubsystem.h b/Source/DTFluxRemote/Public/DTFluxRemoteSubsystem.h index 8aae921..decefb2 100644 --- a/Source/DTFluxRemote/Public/DTFluxRemoteSubsystem.h +++ b/Source/DTFluxRemote/Public/DTFluxRemoteSubsystem.h @@ -84,7 +84,6 @@ private: void UnloadCurrentRundown(); void LoadRundownFromSettings(); - void LoadRundown(); #if WITH_EDITOR FDelegateHandle SettingsRundownChangedHandle;