Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
908442db
Commit
908442db
authored
Dec 17, 2019
by
Jean-Baptiste Mardelle
Browse files
Fix crash caused by incorrect group saved
Should fix
#491
and others
parent
86b2cd2e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/model/groupsmodel.cpp
View file @
908442db
...
...
@@ -820,7 +820,7 @@ int GroupsModel::fromJson(const QJsonObject &o, Fun &undo, Fun &redo)
}
ids
.
insert
(
fromJson
(
c
.
toObject
(),
undo
,
redo
));
}
if
(
ids
.
count
(
-
1
)
>
0
)
{
if
(
ids
.
count
(
-
1
)
>
0
||
type
==
GroupType
::
Selection
)
{
return
-
1
;
}
return
groupItems
(
ids
,
undo
,
redo
,
type
);
...
...
@@ -924,7 +924,6 @@ bool GroupsModel::fromJsonWithOffset(const QString &data, const QMap<int, int> &
}
ok
=
ok
&&
fromJson
(
elem
.
toObject
(),
local_undo
,
local_redo
);
}
if
(
ok
)
{
UPDATE_UNDO_REDO
(
local_redo
,
local_undo
,
undo
,
redo
);
}
else
{
...
...
Eugen Mohr
@emohr
mentioned in issue
#473 (closed)
·
Dec 18, 2019
mentioned in issue
#473 (closed)
mentioned in issue #473
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment