From 4fa3e2a7144c532af62520c9da53f423d6f002ca Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Mon, 24 Apr 2017 01:30:51 +0200
Subject: GH-1856 Fix metadata version and list loading

Shouldn't crash anymore, shouldn't overwrite data in some bad way anymore either.
---
 api/logic/meta/Version.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'api/logic/meta/Version.cpp')

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
-- 
cgit