diff options
author | Petr Mrázek <peterix@gmail.com> | 2013-10-28 20:55:12 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2013-10-28 20:55:12 +0100 |
commit | 6ecb833dbf4c4930c8354dcce7967ad44c16c217 (patch) | |
tree | 268120b4b8f7716b6468a655909e1db210dfe3dc /depends/util/src | |
parent | 923347729557eed76e4f7e9f6f5f1a79216de0a4 (diff) | |
download | MultiMC-6ecb833dbf4c4930c8354dcce7967ad44c16c217.tar MultiMC-6ecb833dbf4c4930c8354dcce7967ad44c16c217.tar.gz MultiMC-6ecb833dbf4c4930c8354dcce7967ad44c16c217.tar.lz MultiMC-6ecb833dbf4c4930c8354dcce7967ad44c16c217.tar.xz MultiMC-6ecb833dbf4c4930c8354dcce7967ad44c16c217.zip |
Fix problem with instance list not using the instance folder path
Diffstat (limited to 'depends/util/src')
-rw-r--r-- | depends/util/src/pathutils.cpp | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/depends/util/src/pathutils.cpp b/depends/util/src/pathutils.cpp index 4c24fa5d..590ac89d 100644 --- a/depends/util/src/pathutils.cpp +++ b/depends/util/src/pathutils.cpp @@ -39,6 +39,30 @@ QString AbsolutePath(QString path) return QFileInfo(path).absolutePath(); } +/** + * Normalize path + * + * Any paths inside the current directory will be normalized to relative paths (to current) + * Other paths will be made absolute + */ +QString NormalizePath(QString path) +{ + QDir a = QDir::currentPath(); + QString currentAbsolute = a.absolutePath(); + + QDir b(path); + QString newAbsolute = b.absolutePath(); + + if (newAbsolute.startsWith(currentAbsolute)) + { + return a.relativeFilePath(newAbsolute); + } + else + { + return newAbsolute; + } +} + QString badFilenameChars = "\"\\/?<>:*|!"; QString RemoveInvalidFilenameChars(QString string, QChar replaceWith) |