From 55bd774a4c6fa5e65e0466d7bec199d455669a6f Mon Sep 17 00:00:00 2001 From: Kyzentun Keeslala Date: Sun, 27 Dec 2015 06:45:49 -0700 Subject: [PATCH] Added copy constructor to LocalizedString so that a LocalizedString created by copying another does not crash in the destructor. --- src/LocalizedString.cpp | 11 +++++++++++ src/LocalizedString.h | 1 + 2 files changed, 12 insertions(+) diff --git a/src/LocalizedString.cpp b/src/LocalizedString.cpp index bca6844c3a..eafe657e01 100644 --- a/src/LocalizedString.cpp +++ b/src/LocalizedString.cpp @@ -45,6 +45,17 @@ LocalizedString::LocalizedString( const RString& sGroup, const RString& sName ) CreateImpl(); } +LocalizedString::LocalizedString(LocalizedString const& other) +{ + m_Subscribers.Subscribe(this); + + m_sGroup = other.m_sGroup; + m_sName = other.m_sName; + m_pImpl = NULL; + + CreateImpl(); +} + LocalizedString::~LocalizedString() { m_Subscribers.Unsubscribe( this ); diff --git a/src/LocalizedString.h b/src/LocalizedString.h index da11706243..b50abd95de 100644 --- a/src/LocalizedString.h +++ b/src/LocalizedString.h @@ -13,6 +13,7 @@ class LocalizedString { public: LocalizedString( const RString& sGroup = "", const RString& sName = "" ); + LocalizedString(LocalizedString const& other); ~LocalizedString(); void Load( const RString& sGroup, const RString& sName ); operator const RString &() const { return GetValue(); }