mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-09-18 16:32:33 +02:00
Fix error z level
Fix conversion of file missinterpreted as an error
This commit is contained in:
parent
ac8b360ecd
commit
c16edb7a84
@ -78,6 +78,7 @@ Item {
|
|||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: wrapperSteps
|
id: wrapperSteps
|
||||||
|
z:10
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
@ -398,11 +399,13 @@ Item {
|
|||||||
PropertyChanges {
|
PropertyChanges {
|
||||||
target: wrapperSteps
|
target: wrapperSteps
|
||||||
opacity: 0
|
opacity: 0
|
||||||
|
z:0
|
||||||
}
|
}
|
||||||
PropertyChanges {
|
PropertyChanges {
|
||||||
target: wrapperError
|
target: wrapperError
|
||||||
opacity: 1
|
opacity: 1
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
transitions: [
|
transitions: [
|
||||||
|
@ -214,9 +214,12 @@ bool Create::createWallpaperVideoPreview(CreateWallpaperData& createWallpaperDat
|
|||||||
qDebug() << tmpErr;
|
qDebug() << tmpErr;
|
||||||
qDebug() << proConvertPreviewMP4.data()->readAllStandardOutput();
|
qDebug() << proConvertPreviewMP4.data()->readAllStandardOutput();
|
||||||
qDebug() << proConvertPreviewMP4.data()->readAll();
|
qDebug() << proConvertPreviewMP4.data()->readAll();
|
||||||
emit processOutput(tmpErr);
|
QFile previewVideo(createWallpaperData.exportPath + "/preview.mp4");
|
||||||
emit createWallpaperStateChanged(Create::State::ConvertingPreviewVideoError);
|
if (!previewVideo.exists() && !(previewVideo.size() > 0)) {
|
||||||
return false;
|
emit processOutput(tmpErr);
|
||||||
|
emit createWallpaperStateChanged(Create::State::ConvertingPreviewVideoError);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// qDebug() << proConvertPreviewMP4.data()->program() << proConvertPreviewMP4.data()->arguments();
|
// qDebug() << proConvertPreviewMP4.data()->program() << proConvertPreviewMP4.data()->arguments();
|
||||||
// qDebug() << "Done converting video to preview" << proConvertPreviewMP4.data()->readAll() << "\n"
|
// qDebug() << "Done converting video to preview" << proConvertPreviewMP4.data()->readAll() << "\n"
|
||||||
@ -251,8 +254,11 @@ bool Create::createWallpaperVideoPreview(CreateWallpaperData& createWallpaperDat
|
|||||||
proConvertGif.data()->start();
|
proConvertGif.data()->start();
|
||||||
proConvertGif.data()->waitForFinished(-1);
|
proConvertGif.data()->waitForFinished(-1);
|
||||||
if (!proConvertGif.data()->readAllStandardError().isEmpty()) {
|
if (!proConvertGif.data()->readAllStandardError().isEmpty()) {
|
||||||
emit createWallpaperStateChanged(Create::State::ConvertingPreviewGifError);
|
QFile previewGif(createWallpaperData.exportPath + "/preview.gif");
|
||||||
return false;
|
if (!previewGif.exists() && !(previewGif.size() > 0)) {
|
||||||
|
emit createWallpaperStateChanged(Create::State::ConvertingPreviewGifError);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// qDebug() << proConvertGif.data()->program() << proConvertGif.data()->arguments();
|
// qDebug() << proConvertGif.data()->program() << proConvertGif.data()->arguments();
|
||||||
|
Loading…
Reference in New Issue
Block a user