Another attempt to fix DVD Wizard freeze

CCBUG: 352057
parent 9a006b87
...@@ -188,8 +188,8 @@ void DvdWizard::generateDvd() ...@@ -188,8 +188,8 @@ void DvdWizard::generateDvd()
// We failed creating tmp DVD directory // We failed creating tmp DVD directory
KMessageBox::sorry(this, i18n("Cannot create temporary directory %1", m_status.tmp_folder->url().path() + "DVD")); KMessageBox::sorry(this, i18n("Cannot create temporary directory %1", m_status.tmp_folder->url().path() + "DVD"));
return; return;
} }
m_status.error_box->setHidden(true); m_status.error_box->setHidden(true);
m_status.error_box->setCurrentIndex(0); m_status.error_box->setCurrentIndex(0);
m_status.menu_file->clear(); m_status.menu_file->clear();
...@@ -199,7 +199,7 @@ void DvdWizard::generateDvd() ...@@ -199,7 +199,7 @@ void DvdWizard::generateDvd()
m_selectedLetterImage.setFileTemplate(m_status.tmp_folder->url().path() + QStringLiteral("XXXXXX.png")); m_selectedLetterImage.setFileTemplate(m_status.tmp_folder->url().path() + QStringLiteral("XXXXXX.png"));
m_highlightedImage.setFileTemplate(m_status.tmp_folder->url().path() + QStringLiteral("XXXXXX.png")); m_highlightedImage.setFileTemplate(m_status.tmp_folder->url().path() + QStringLiteral("XXXXXX.png"));
m_highlightedLetterImage.setFileTemplate(m_status.tmp_folder->url().path() + QStringLiteral("XXXXXX.png")); m_highlightedLetterImage.setFileTemplate(m_status.tmp_folder->url().path() + QStringLiteral("XXXXXX.png"));
m_selectedImage.open(); m_selectedImage.open();
m_selectedLetterImage.open(); m_selectedLetterImage.open();
m_highlightedImage.open(); m_highlightedImage.open();
...@@ -218,7 +218,7 @@ void DvdWizard::generateDvd() ...@@ -218,7 +218,7 @@ void DvdWizard::generateDvd()
m_letterboxMovie.setFileTemplate(m_status.tmp_folder->url().path() + QStringLiteral("XXXXXX.mpg")); m_letterboxMovie.setFileTemplate(m_status.tmp_folder->url().path() + QStringLiteral("XXXXXX.mpg"));
m_letterboxMovie.setAutoRemove(false); m_letterboxMovie.setAutoRemove(false);
m_letterboxMovie.open(); m_letterboxMovie.open();
m_menuFile.close(); m_menuFile.close();
m_menuFile.setFileTemplate(m_status.tmp_folder->url().path() + QStringLiteral("XXXXXX.xml")); m_menuFile.setFileTemplate(m_status.tmp_folder->url().path() + QStringLiteral("XXXXXX.xml"));
m_menuFile.setAutoRemove(false); m_menuFile.setAutoRemove(false);
......
...@@ -149,7 +149,6 @@ void DvdWizardChapters::createMonitor(DVDFORMAT format) ...@@ -149,7 +149,6 @@ void DvdWizardChapters::createMonitor(DVDFORMAT format)
m_monitor->setSizePolicy(QSizePolicy ( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); m_monitor->setSizePolicy(QSizePolicy ( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
m_manager->appendMonitor(m_monitor); m_manager->appendMonitor(m_monitor);
} }
else m_monitor->reparent();
} }
void DvdWizardChapters::setVobFiles(DVDFORMAT format, const QStringList &movies, const QStringList &durations, const QStringList &chapters) void DvdWizardChapters::setVobFiles(DVDFORMAT format, const QStringList &movies, const QStringList &durations, const QStringList &chapters)
...@@ -173,7 +172,7 @@ void DvdWizardChapters::setVobFiles(DVDFORMAT format, const QStringList &movies, ...@@ -173,7 +172,7 @@ void DvdWizardChapters::setVobFiles(DVDFORMAT format, const QStringList &movies,
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
adjustSize(); adjustSize();
updateGeometry(); updateGeometry();
QTimer::singleShot(0, this, SLOT(slotUpdateChaptersList())); slotUpdateChaptersList();
} }
QMap <QString, QString> DvdWizardChapters::chaptersData() const QMap <QString, QString> DvdWizardChapters::chaptersData() const
......
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