diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-06-01 17:46:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-01 17:46:12 +0200 |
| commit | 147bde5294626d7ba1a6cd672200f7da878eddd9 (patch) | |
| tree | d9f49c84ff827c76e5f5ae7d3316cf0e7166c1c4 | |
| parent | a88ad8025b99e4882f2004ab52a8ed5bd32cc7ab (diff) | |
| parent | 1a004f0c4d624453e4f477d025aa46a8a8d47ce4 (diff) | |
| download | PrismLauncher-147bde5294626d7ba1a6cd672200f7da878eddd9.tar.gz PrismLauncher-147bde5294626d7ba1a6cd672200f7da878eddd9.tar.bz2 PrismLauncher-147bde5294626d7ba1a6cd672200f7da878eddd9.zip | |
Merge pull request #692 from glowiak/patch-6
| -rw-r--r-- | launcher/UpdateController.cpp | 2 | ||||
| -rw-r--r-- | launcher/tools/MCEditTool.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/launcher/UpdateController.cpp b/launcher/UpdateController.cpp index 646f8e57..c27fe772 100644 --- a/launcher/UpdateController.cpp +++ b/launcher/UpdateController.cpp @@ -93,7 +93,7 @@ void UpdateController::installUpdates() qDebug() << "Installing updates."; #ifdef Q_OS_WIN QString finishCmd = QApplication::applicationFilePath(); -#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined (Q_OS_OPENBSD) +#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) QString finishCmd = FS::PathCombine(m_root, BuildConfig.LAUNCHER_NAME); #elif defined Q_OS_MAC QString finishCmd = QApplication::applicationFilePath(); diff --git a/launcher/tools/MCEditTool.cpp b/launcher/tools/MCEditTool.cpp index 2c1ec613..21e1a3b0 100644 --- a/launcher/tools/MCEditTool.cpp +++ b/launcher/tools/MCEditTool.cpp @@ -52,7 +52,7 @@ QString MCEditTool::getProgramPath() #else const QString mceditPath = path(); QDir mceditDir(mceditPath); -#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) +#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) if (mceditDir.exists("mcedit.sh")) { return mceditDir.absoluteFilePath("mcedit.sh"); |