Reset Sdk on subsystem Deinitialize

voxeet · Aug 2, 2023 · 2f9028f · 2f9028f
1 parent 925390d
commit 2f9028f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/DolbyIO/Source/Private/Subsystem/DolbyIOInitialization.cpp b/DolbyIO/Source/Private/Subsystem/DolbyIOInitialization.cpp
@@ -37,6 +37,13 @@ void UDolbyIOSubsystem::Initialize(FSubsystemCollectionBase& Collection)
 	BroadcastEvent(OnTokenNeeded);
 }
 
+void UDolbyIOSubsystem::Deinitialize()
+{
+	Sdk.Reset(); // make sure Sdk is dead so it doesn't call handle_frame on VideoSink during game destruction
+
+	Super::Deinitialize();
+}
+
 void UDolbyIOSubsystem::SetLogSettings(EDolbyIOLogLevel SdkLogLevel, EDolbyIOLogLevel MediaLogLevel,
                                        EDolbyIOLogLevel DvcLogLevel)
 {

diff --git a/DolbyIO/Source/Public/DolbyIO.h b/DolbyIO/Source/Public/DolbyIO.h
@@ -322,6 +322,7 @@ class DOLBYIO_API UDolbyIOSubsystem : public UGameInstanceSubsystem
 
 private:
 	void Initialize(FSubsystemCollectionBase&) override;
+	void Deinitialize() override;
 
 	bool CanConnect(const FDolbyIOOnErrorDelegate&) const;
 	bool IsConnected() const;