8000 fix wrong previous commit (missed changes, doesn't compile) · szczk/kdenlive@d884e94 · GitHub
[go: up one dir, main page]

Skip to content

Commit

Permalink
fix wrong previous commit (missed changes, doesn't compile)
Browse files Browse the repository at this point in the history
  • Loading branch information
vpinon committed Nov 5, 2018
1 parent 021437c commit d884e94
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/mltconnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ void MltConnection::locateMeltAndProfilesPath(const QString &mltPath)
if (profilePath.isEmpty() || !QFile::exists(profilePath)) profilePath = KdenliveSettings::mltpath();
#endif
//try to automatically guess MLT path if installed with the same prefix as kdenlive with default data path
if (profilePath.isEmpty() || !QFile::exists(profilePath)) profilePath = qApp->applicationDirPath() + QStringLiteral("/../share/mlt/profiles/");
if (profilePath.isEmpty() || !QFile::exists(profilePath)) profilePath = QDir::cleanPath(qApp->applicationDirPath() + QStringLiteral("/../share/mlt/profiles/"));
//fallback to build-time definition
if ((profilePath.isEmpty() || !QFile::exists(profilePath)) && !QStringLiteral(MLT_DATADIR).isEmpty()) profilePath = QStringLiteral(MLT_DATADIR) + QStringLiteral("/profiles/");
KdenliveSettings::setMltpath(profilePath);

#ifdef Q_OS_WIN
const QStringLiteral exeSuffix(".exe");
QString exeSuffix = ".exe";
#else
const QStringLiteral exeSuffix();
QString exeSuffix = "";
#endif
QString meltPath = qgetenv("MLT_PREFIX") + QStringLiteral("/bin/melt") + exeSuffix;
if (!QFile::exists(meltPath)) meltPath = QDir::cleanPath(profilePath + QStringLiteral("../../../bin/melt") + exeSuffix);
Expand Down

0 comments on commit d884e94

Please sign in to comment.
0