From 093e15e1055586484f549e45b94fee8255d50beb Mon Sep 17 00:00:00 2001 From: D8H Date: Mon, 20 Jan 2025 14:35:37 +0100 Subject: [PATCH] Fix EventsFunctionsContainer copy constructor now copy the owner (#7327) - Don't show in changelog --- Core/GDCore/Project/EventsFunctionsContainer.h | 7 +++++-- Core/tests/EventsFunctionsContainer.cpp | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Core/GDCore/Project/EventsFunctionsContainer.h b/Core/GDCore/Project/EventsFunctionsContainer.h index 05a9791b5363..0833b9561310 100644 --- a/Core/GDCore/Project/EventsFunctionsContainer.h +++ b/Core/GDCore/Project/EventsFunctionsContainer.h @@ -33,13 +33,16 @@ class GD_CORE_API EventsFunctionsContainer EventsFunctionsContainer(FunctionOwner source_) : owner(source_) {} - EventsFunctionsContainer(const EventsFunctionsContainer &other) { + EventsFunctionsContainer(const EventsFunctionsContainer &other) + : owner(other.owner) { Init(other); } EventsFunctionsContainer &operator=(const EventsFunctionsContainer &other) { - if (this != &other) + if (this != &other) { + owner = other.owner; Init(other); + } return *this; } diff --git a/Core/tests/EventsFunctionsContainer.cpp b/Core/tests/EventsFunctionsContainer.cpp index 35ff5af50cac..7265b910f306 100644 --- a/Core/tests/EventsFunctionsContainer.cpp +++ b/Core/tests/EventsFunctionsContainer.cpp @@ -38,6 +38,8 @@ TEST_CASE("EventsFunctionsContainer", "[common]") { "Function2.x"); REQUIRE(eventsFunctionContainer.GetEventsFunction(2).GetName() == "Function3"); + REQUIRE(eventsFunctionContainer.GetOwner() == + gd::EventsFunctionsContainer::FunctionOwner::Extension); REQUIRE(eventsFunctionContainer2.GetEventsFunctionsCount() == 3); REQUIRE(eventsFunctionContainer2.GetEventsFunction(0).GetName() == "Function1.y");