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
4708ac10
Commit
4708ac10
authored
Jun 23, 2019
by
Jean-Baptiste Mardelle
Browse files
Fix incorrect crash message on rendering finished
parent
775c2676
Pipeline
#4538
passed with stage
in 23 minutes and 16 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
renderer/kdenlive_render.cpp
View file @
4708ac10
...
...
@@ -28,6 +28,7 @@
#include <QString>
#include <QStringList>
#include <QUrl>
#include <QObject>
#include <cstdio>
int
main
(
int
argc
,
char
**
argv
)
...
...
@@ -138,8 +139,12 @@ int main(int argc, char **argv)
}
}
auto
*
rJob
=
new
RenderJob
(
render
,
playlist
,
target
,
pid
,
in
,
out
);
auto
*
rJob
=
new
RenderJob
(
render
,
playlist
,
target
,
pid
,
in
,
out
,
qApp
);
rJob
->
start
();
QObject
::
connect
(
rJob
,
&
RenderJob
::
renderingFinished
,
[
&
,
rJob
]()
{
rJob
->
deleteLater
();
app
.
quit
();
});
return
app
.
exec
();
}
else
{
fprintf
(
stderr
,
...
...
renderer/renderjob.cpp
View file @
4708ac10
...
...
@@ -32,8 +32,8 @@ public:
static
void
msleep
(
unsigned
long
msecs
)
{
QThread
::
msleep
(
msecs
);
}
};
RenderJob
::
RenderJob
(
const
QString
&
render
,
const
QString
&
scenelist
,
const
QString
&
target
,
int
pid
,
int
in
,
int
out
)
:
QObject
()
RenderJob
::
RenderJob
(
const
QString
&
render
,
const
QString
&
scenelist
,
const
QString
&
target
,
int
pid
,
int
in
,
int
out
,
QObject
*
parent
)
:
QObject
(
parent
)
,
m_scenelist
(
scenelist
)
,
m_dest
(
std
::
move
(
target
))
,
m_progress
(
0
)
...
...
@@ -73,6 +73,8 @@ RenderJob::RenderJob(const QString &render, const QString &scenelist, const QStr
RenderJob
::~
RenderJob
()
{
delete
m_jobUiserver
;
delete
m_kdenliveinterface
;
delete
m_renderProcess
;
m_logfile
.
close
();
}
...
...
@@ -256,7 +258,7 @@ void RenderJob::slotIsOver(QProcess::ExitStatus status, bool isWritable)
{
if
(
m_jobUiserver
)
{
m_jobUiserver
->
call
(
QStringLiteral
(
"setDescriptionField"
),
(
uint
)
1
,
tr
(
"Rendered file"
),
m_dest
);
//
m_jobUiserver->call(QStringLiteral("terminate"), QString());
m_jobUiserver
->
call
(
QStringLiteral
(
"terminate"
),
QString
());
}
if
(
!
isWritable
)
{
QString
error
=
tr
(
"Cannot write to %1, check permissions."
).
arg
(
m_dest
);
...
...
@@ -265,9 +267,10 @@ void RenderJob::slotIsOver(QProcess::ExitStatus status, bool isWritable)
m_dbusargs
.
append
(
error
);
m_kdenliveinterface
->
callWithArgumentList
(
QDBus
::
NoBlock
,
QStringLiteral
(
"setRenderingFinished"
),
m_dbusargs
);
}
QProcess
::
startDetached
(
QStringLiteral
(
"kdialog"
),
QStringList
()
<<
QStringLiteral
(
"--error"
)
<<
error
);
QProcess
::
startDetached
(
QStringLiteral
(
"kdialog"
),
{
QStringLiteral
(
"--error"
)
,
error
}
);
m_logstream
<<
error
<<
endl
;
qApp
->
quit
();
emit
renderingFinished
();
//qApp->quit();
}
if
(
m_erase
)
{
QFile
(
m_scenelist
).
remove
();
...
...
@@ -284,7 +287,7 @@ void RenderJob::slotIsOver(QProcess::ExitStatus status, bool isWritable)
args
<<
QStringLiteral
(
"--error"
)
<<
error
;
m_logstream
<<
error
<<
endl
;
QProcess
::
startDetached
(
QStringLiteral
(
"kdialog"
),
args
);
qApp
->
quit
();
emit
renderingFinished
();
}
else
{
if
(
!
m_dualpass
&&
(
m_kdenliveinterface
!=
nullptr
))
{
m_dbusargs
[
1
]
=
(
int
)
-
1
;
...
...
@@ -302,11 +305,10 @@ void RenderJob::slotIsOver(QProcess::ExitStatus status, bool isWritable)
}
m_logstream
.
flush
();
if
(
m_dualpass
)
{
emit
renderingFinished
();
deleteLater
();
}
else
{
m_logfile
.
remove
();
qApp
->
quit
();
}
}
emit
renderingFinished
();
}
renderer/renderjob.h
View file @
4708ac10
...
...
@@ -33,7 +33,7 @@ class RenderJob : public QObject
Q_OBJECT
public:
RenderJob
(
const
QString
&
render
,
const
QString
&
scenelist
,
const
QString
&
target
,
int
pid
=
-
1
,
int
in
=
-
1
,
int
out
=
-
1
);
RenderJob
(
const
QString
&
render
,
const
QString
&
scenelist
,
const
QString
&
target
,
int
pid
=
-
1
,
int
in
=
-
1
,
int
out
=
-
1
,
QObject
*
parent
=
nullptr
);
~
RenderJob
();
void
setLocale
(
const
QString
&
locale
);
...
...
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