Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Multimedia
Kdenlive
Commits
cb75b730
Commit
cb75b730
authored
May 21, 2020
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix possible crash on close (audio thumbnail job)
parent
207db629
Pipeline
#20770
passed with stage
in 9 minutes and 17 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
src/jobs/audiothumbjob.cpp
src/jobs/audiothumbjob.cpp
+7
-1
No files found.
src/jobs/audiothumbjob.cpp
View file @
cb75b730
...
...
@@ -207,12 +207,13 @@ bool AudioThumbJob::computeWithFFMPEG()
if
(
m_ffmpegProcess
)
{
disconnect
(
m_ffmpegProcess
.
get
(),
&
QProcess
::
readyReadStandardOutput
,
this
,
&
AudioThumbJob
::
updateFfmpegProgress
);
m_ffmpegProcess
->
kill
();
m_successful
=
false
;
}
});
m_ffmpegProcess
->
start
(
KdenliveSettings
::
ffmpegpath
(),
args
);
m_ffmpegProcess
->
waitForFinished
(
-
1
);
disconnect
(
m_ffmpegProcess
.
get
(),
&
QProcess
::
readyReadStandardOutput
,
this
,
&
AudioThumbJob
::
updateFfmpegProgress
);
if
(
m_ffmpegProcess
->
exitStatus
()
!=
QProcess
::
CrashExit
)
{
if
(
m_successful
&&
m_ffmpegProcess
->
exitStatus
()
!=
QProcess
::
CrashExit
)
{
int
dataSize
=
0
;
std
::
vector
<
const
qint16
*>
rawChannels
;
std
::
vector
<
QByteArray
>
sourceChannels
;
...
...
@@ -357,6 +358,11 @@ bool AudioThumbJob::startJob()
ok
=
ok
?
ok
:
computeWithMlt
();
}
Q_ASSERT
(
ok
==
m_done
);
if
(
!
m_successful
)
{
// Job was aborted
m_done
=
true
;
return
false
;
}
if
(
ok
&&
m_done
&&
!
m_audioLevels
.
isEmpty
())
{
// Put into an image for caching.
...
...
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