Fix double separator in project/capture folder

CCBUG: 387135
parent 1eca686f
......@@ -400,9 +400,9 @@ void RenderWidget::setDocumentPath(const QString &path)
if (m_view.out_file->url().adjusted(QUrl::RemoveFilename).toLocalFile() ==
QUrl::fromLocalFile(m_projectFolder).adjusted(QUrl::RemoveFilename).toLocalFile()) {
const QString fileName = m_view.out_file->url().fileName();
m_view.out_file->setUrl(QUrl::fromLocalFile(path + fileName));
m_view.out_file->setUrl(QUrl::fromLocalFile(QDir(path).absoluteFilePath(fileName)));
}
m_projectFolder = path;
m_projectFolder = QUrl::fromLocalFile(path).adjusted(QUrl::NormalizePathSegments | QUrl::StripTrailingSlash).toLocalFile() + QDir::separator();
parseScriptFiles();
}
......
......@@ -1748,7 +1748,7 @@ void MainWindow::slotEditProjectSettings()
}
bool modified = false;
if (m_renderWidget) {
m_renderWidget->setDocumentPath(project->projectDataFolder() + QDir::separator());
m_renderWidget->setDocumentPath(project->projectDataFolder());
}
if (KdenliveSettings::videothumbnails() != w->enableVideoThumbs()) {
slotSwitchVideoThumbs();
......@@ -1876,7 +1876,7 @@ void MainWindow::slotRenderProject()
connect(this, &MainWindow::updateRenderWidgetProfile, m_renderWidget, &RenderWidget::adjustViewToProfile);
double projectDuration = GenTime(getMainTimeline()->controller()->duration(), pCore->getCurrentFps()).ms() / 1000;
m_renderWidget->setGuides(project->getGuideModel()->getAllMarkers(), projectDuration);
m_renderWidget->setDocumentPath(project->projectDataFolder() + QDir::separator());
m_renderWidget->setDocumentPath(project->projectDataFolder());
m_renderWidget->setRenderProfile(project->getRenderProperties());
}
if (m_compositeAction->currentAction()) {
......@@ -2104,7 +2104,7 @@ void MainWindow::connectDocument()
if (m_renderWidget) {
slotCheckRenderStatus();
// m_renderWidget->setGuides(pCore->projectManager()->currentTimeline()->projectView()->guidesData(), project->projectDuration());
m_renderWidget->setDocumentPath(project->projectDataFolder() + QDir::separator());
m_renderWidget->setDocumentPath(project->projectDataFolder());
m_renderWidget->setRenderProfile(project->getRenderProperties());
}
m_zoomSlider->setValue(project->zoom().x());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment