Commit f0bba703 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Startup crash detection: make the check later so that we can also detect movit...

Startup crash detection: make the check later so that we can also detect movit crash and propose to reset the config file
parent ce643e3e
......@@ -102,6 +102,9 @@ bool Core::build(bool testMode)
// a previous instance crashed, propose to delete config files
if (KMessageBox::questionYesNo(QApplication::activeWindow(), i18n("Kdenlive crashed on last startup.\nDo you want to reset the configuration files ?")) == KMessageBox::Yes)
{
// Release startup crash lock file
QFile lockFile(QDir::temp().absoluteFilePath(QStringLiteral("kdenlivelock")));
lockFile.remove();
return false;
}
} else {
......@@ -223,10 +226,6 @@ void Core::initGUI(bool isAppImage, const QString &MltPath, const QUrl &Url, con
}
QMetaObject::invokeMethod(pCore->projectManager(), "slotLoadOnOpen", Qt::QueuedConnection);
m_mainWindow->show();
// Release startup crash lock file
QFile lockFile(QDir::temp().absoluteFilePath(QStringLiteral("kdenlivelock")));
lockFile.remove();
}
void Core::buildLumaThumbs(const QStringList &values)
......
......@@ -108,7 +108,6 @@ void ProjectManager::slotLoadOnOpen()
} else {
newFile(false);
}
if (!m_loadClipsOnOpen.isEmpty() && (m_project != nullptr)) {
const QStringList list = m_loadClipsOnOpen.split(QLatin1Char(','));
QList<QUrl> urls;
......@@ -122,6 +121,9 @@ void ProjectManager::slotLoadOnOpen()
m_loadClipsOnOpen.clear();
m_loading = false;
emit pCore->closeSplash();
// Release startup crash lock file
QFile lockFile(QDir::temp().absoluteFilePath(QStringLiteral("kdenlivelock")));
lockFile.remove();
}
void ProjectManager::init(const QUrl &projectUrl, const QString &clipList)
......
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