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
5600246b
Commit
5600246b
authored
May 08, 2019
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't delete timeline preview files on project close
parent
1900cc33
Pipeline
#3393
passed with stage
in 20 minutes and 56 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
1 deletion
+10
-1
src/project/projectmanager.cpp
src/project/projectmanager.cpp
+1
-0
src/timeline2/view/previewmanager.cpp
src/timeline2/view/previewmanager.cpp
+1
-1
src/timeline2/view/timelinecontroller.cpp
src/timeline2/view/timelinecontroller.cpp
+6
-0
src/timeline2/view/timelinecontroller.h
src/timeline2/view/timelinecontroller.h
+2
-0
No files found.
src/project/projectmanager.cpp
View file @
5600246b
...
...
@@ -240,6 +240,7 @@ bool ProjectManager::closeCurrentDocument(bool saveChanges, bool quit)
}
}
pCore
->
window
()
->
getMainTimeline
()
->
controller
()
->
clipActions
.
clear
();
pCore
->
window
()
->
getMainTimeline
()
->
controller
()
->
prepareClose
();
if
(
m_mainTimelineModel
)
{
m_mainTimelineModel
->
prepareClose
();
}
...
...
src/timeline2/view/previewmanager.cpp
View file @
5600246b
...
...
@@ -546,7 +546,6 @@ void PreviewManager::doPreviewRender(const QString &scene)
m_consumerParams
.
join
(
QLatin1Char
(
' '
))};
qDebug
()
<<
" - - -STARTING PREVIEW JOBS: "
<<
args
;
pCore
->
currentDoc
()
->
previewProgress
(
0
);
m_previewProcess
.
start
(
m_renderer
,
args
);
QObject
::
connect
(
&
m_previewProcess
,
QOverload
<
int
,
QProcess
::
ExitStatus
>::
of
(
&
QProcess
::
finished
),
[
this
,
scene
](
int
,
QProcess
::
ExitStatus
status
)
{
qDebug
()
<<
"// PROCESS IS FINISHED!!!"
;
QFile
::
remove
(
scene
);
...
...
@@ -565,6 +564,7 @@ void PreviewManager::doPreviewRender(const QString &scene)
workingPreview
=
-
1
;
m_controller
->
workingPreviewChanged
();
});
m_previewProcess
.
start
(
m_renderer
,
args
);
if
(
m_previewProcess
.
waitForStarted
())
{
qDebug
()
<<
" - - -STARTING PREVIEW JOBS . . . STARTED"
;
}
...
...
src/timeline2/view/timelinecontroller.cpp
View file @
5600246b
...
...
@@ -82,6 +82,12 @@ TimelineController::TimelineController(QObject *parent)
TimelineController
::~
TimelineController
()
{
prepareClose
();
}
void
TimelineController
::
prepareClose
()
{
// Delete timeline preview before resetting model so that removing clips from timeline doesn't invalidate
delete
m_timelinePreview
;
m_timelinePreview
=
nullptr
;
}
...
...
src/timeline2/view/timelinecontroller.h
View file @
5600246b
...
...
@@ -450,6 +450,8 @@ public:
QStringList
getThumbKeys
();
/** @brief Returns true if a drag operation is currently running in timeline */
bool
dragOperationRunning
();
/** @brief Disconnect some stuff before closing project */
void
prepareClose
();
public
slots
:
void
resetView
();
...
...
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