Fix: Stack allocated UObject (#59)

* Construct object with pointer instead of ref * Removed Stack allocated UObject
JBenda · Oct 17, 2023 · a8d324f · a8d324f
1 parent 2f8a08f
commit a8d324f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/unreal/inkcpp/Source/inkcpp/Private/InkChoice.cpp b/unreal/inkcpp/Source/inkcpp/Private/InkChoice.cpp
@@ -7,14 +7,18 @@ FString UInkChoice::GetText() const
 	return data->text();
 }
 
+UInkChoice::UInkChoice() {
+	tags = NewObject<UTagList>();
+}
+
 int UInkChoice::GetIndex() const
 {
 	return data->index();
 }
 
 const UTagList* UInkChoice::GetTags() const
 {
-	return &tags;
+	return tags;
 }
 
 void UInkChoice::Initialize(const ink::runtime::choice* c)
@@ -25,6 +29,6 @@ void UInkChoice::Initialize(const ink::runtime::choice* c)
 		for(unsigned i = 0; i < c->num_tags(); ++i) {
 			fstring_tags.Add(FString(c->get_tag(i)));
 		}
-		tags.Initialize(fstring_tags);
+		tags->Initialize(fstring_tags);
 	}
 }
diff --git a/unreal/inkcpp/Source/inkcpp/Public/InkChoice.h b/unreal/inkcpp/Source/inkcpp/Public/InkChoice.h
@@ -14,6 +14,8 @@ class UInkChoice : public UObject
 {
 	GENERATED_BODY()
 public:
+	UInkChoice();
+
 	UFUNCTION(BlueprintPure, Category="Ink")
 	FString GetText() const;
 
@@ -29,5 +31,5 @@ class UInkChoice : public UObject
 
 private:
 	const ink::runtime::choice* data;
-	UTagList tags;
+	TObjectPtr<UTagList> tags;
 };
diff --git a/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.cpp b/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.cpp
@@ -18,7 +18,7 @@ DECLARE_LOG_CATEGORY_EXTERN(InkCpp, Log, All);
 DEFINE_LOG_CATEGORY(InkCpp);
 
 UInkAssetFactory::UInkAssetFactory(const FObjectInitializer& ObjectInitializer)
-	: UFactory(ObjectInitializer), FReimportHandler(), object_ptr(*this)
+	: UFactory(ObjectInitializer), FReimportHandler(), object_ptr(this)
 {
 	// Add ink format
 	Formats.Add(FString(TEXT("json;")) + NSLOCTEXT("UInkAssetFactory", "FormatInkJSON", "Ink JSON File").ToString());