summaryrefslogtreecommitdiffstats
path: root/api/logic/meta/Version.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'api/logic/meta/Version.cpp')
-rw-r--r--api/logic/meta/Version.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/api/logic/meta/Version.cpp b/api/logic/meta/Version.cpp
index 338e180b..b00a29e7 100644
--- a/api/logic/meta/Version.cpp
+++ b/api/logic/meta/Version.cpp
@@ -25,6 +25,10 @@ Meta::Version::Version(const QString &uid, const QString &version)
{
}
+Meta::Version::~Version()
+{
+}
+
QString Meta::Version::descriptor()
{
return m_version;
@@ -76,8 +80,10 @@ void Meta::Version::merge(const std::shared_ptr<BaseEntity> &other)
{
setParentUid(version->m_parentUid);
}
-
- setData(version->m_data);
+ if(version->m_data)
+ {
+ setData(version->m_data);
+ }
}
QString Meta::Version::localFilename() const