Skip to content
GitLab
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
77839392
Commit
77839392
authored
Apr 16, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix crash on cancel clip job & correctly handle abortion of stabilize job
parent
d4ee47c2
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/jobs/jobmanager.cpp
View file @
77839392
...
...
@@ -247,7 +247,10 @@ void JobManager::slotManageCanceledJob(int id)
{
qDebug
()
<<
"################### JOB canceled: "
<<
id
;
QReadLocker
locker
(
&
m_lock
);
Q_ASSERT
(
m_jobs
.
count
(
id
)
>
0
);
if
(
m_jobs
.
count
(
id
)
==
0
)
{
// Job finished, nothing to do
return
;
}
if
(
m_jobs
[
id
]
->
m_processed
)
return
;
m_jobs
[
id
]
->
m_processed
=
true
;
//m_jobs[id]->m_completionMutex.unlock(); // crashing on Windows
...
...
src/jobs/meltjob.cpp
View file @
77839392
...
...
@@ -212,6 +212,8 @@ bool MeltJob::startJob()
connect
(
this
,
&
MeltJob
::
jobCanceled
,
[
&
]
()
{
m_showFrameEvent
.
reset
();
m_consumer
->
stop
();
m_successful
=
false
;
m_done
=
true
;
return
false
;
});
m_consumer
->
run
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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