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
bd8b6cdf
Commit
bd8b6cdf
authored
Dec 02, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix possibly incorrect rendering on Windows (proxy used when they shouldn't)
CCBUG: 429905
parent
2b71bdec
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/dialogs/renderwidget.cpp
View file @
bd8b6cdf
...
...
@@ -1294,7 +1294,7 @@ void RenderWidget::prepareRendering(bool delayedRendering, const QString &chapte
}
// replace proxy clips with originals
QMap
<
QString
,
QString
>
proxies
=
pCore
->
projectItemModel
()
->
getProxies
(
pCore
->
currentDoc
()
->
documentR
oot
()
);
QMap
<
QString
,
QString
>
proxies
=
pCore
->
projectItemModel
()
->
getProxies
(
r
oot
);
QDomNodeList
producers
=
doc
.
elementsByTagName
(
QStringLiteral
(
"producer"
));
QString
producerResource
;
...
...
src/doc/kdenlivedoc.cpp
View file @
bd8b6cdf
...
...
@@ -1299,7 +1299,7 @@ void KdenliveDoc::loadDocumentProperties()
QDomElement
baseElement
=
m_document
.
documentElement
();
m_documentRoot
=
baseElement
.
attribute
(
QStringLiteral
(
"root"
));
if
(
!
m_documentRoot
.
isEmpty
())
{
m_documentRoot
=
QDir
::
cleanPath
(
m_documentRoot
)
+
Q
Dir
::
separator
(
);
m_documentRoot
=
QDir
::
cleanPath
(
m_documentRoot
)
+
Q
Latin1Char
(
'/'
);
}
if
(
!
list
.
isEmpty
())
{
QDomElement
pl
=
list
.
at
(
0
).
toElement
();
...
...
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