GH-1856 Fix metadata version and list loading
Shouldn't crash anymore, shouldn't overwrite data in some bad way anymore either.
This commit is contained in:
parent
d25a7ad3a6
commit
4fa3e2a714
10 changed files with 73 additions and 55 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue