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
34da6a7b
Commit
34da6a7b
authored
Mar 11, 2022
by
Jean-Baptiste Mardelle
Browse files
Fix defects
parent
d29a962a
Pipeline
#148577
passed with stage
in 11 minutes and 5 seconds
Changes
2
Pipelines
4
Hide whitespace changes
Inline
Side-by-side
src/mainwindow.cpp
View file @
34da6a7b
...
...
@@ -2599,7 +2599,7 @@ void MainWindow::slotDeleteClipMarker(bool allowGuideDeletion)
}
bool
markerFound
=
false
;
CommentedTime
marker
=
clip
->
getMarkerModel
()
->
getMarker
(
pos
,
&
markerFound
);
clip
->
getMarkerModel
()
->
getMarker
(
pos
,
&
markerFound
);
if
(
!
markerFound
)
{
if
(
allowGuideDeletion
&&
m_projectMonitor
->
isActive
())
{
slotDeleteGuide
();
...
...
@@ -2648,7 +2648,7 @@ void MainWindow::slotEditClipMarker()
}
bool
markerFound
=
false
;
CommentedTime
oldMarker
=
clip
->
getMarkerModel
()
->
getMarker
(
pos
,
&
markerFound
);
clip
->
getMarkerModel
()
->
getMarker
(
pos
,
&
markerFound
);
if
(
!
markerFound
)
{
m_messageLabel
->
setMessage
(
i18n
(
"No marker found at cursor time"
),
ErrorMessage
);
return
;
...
...
@@ -2959,7 +2959,6 @@ void MainWindow::slotAddTransition(QAction *result)
void
MainWindow
::
slotAddEffect
(
QAction
*
result
)
{
qDebug
()
<<
"// EFFECTS MENU TRIGGERED: "
<<
result
->
data
().
toString
();
if
(
!
result
)
{
return
;
}
...
...
src/timeline2/model/clipmodel.cpp
View file @
34da6a7b
...
...
@@ -1340,13 +1340,7 @@ bool ClipModel::checkConsistency()
}
std
::
shared_ptr
<
ProjectClip
>
binClip
=
pCore
->
projectItemModel
()
->
getClipByBinID
(
m_binClipId
);
auto
instances
=
binClip
->
timelineInstances
();
bool
found
=
false
;
for
(
const
auto
&
i
:
qAsConst
(
instances
))
{
if
(
i
==
m_id
)
{
found
=
true
;
break
;
}
}
bool
found
=
instances
.
contains
(
m_id
);
if
(
!
found
)
{
qDebug
()
<<
"ERROR: binClip doesn't acknowledge timeline clip existence"
;
return
false
;
...
...
Write
Preview
Markdown
is supported
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