From c581931b7001a10c185b029f3e947c3812b5c5d6 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 14 Feb 2019 14:14:22 +0100 Subject: Fix assert in IoUtils::resolvePath Having an empty base dir should not assert when passing an absolute path file name without drive letter. Change-Id: Ic9f1278df1a8ba938d893f4d21ce1c0bf9053632 Reviewed-by: Christian Stenger Reviewed-by: Christian Kandeler --- src/shared/proparser/ioutils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/proparser/ioutils.cpp b/src/shared/proparser/ioutils.cpp index 0552bd1097..b0a52d33eb 100644 --- a/src/shared/proparser/ioutils.cpp +++ b/src/shared/proparser/ioutils.cpp @@ -101,8 +101,8 @@ QString IoUtils::resolvePath(const QString &baseDir, const QString &fileName) return QDir::cleanPath(fileName); #ifdef Q_OS_WIN // Add drive to otherwise-absolute path: if (fileName.at(0).unicode() == '/' || fileName.at(0).unicode() == '\\') { - Q_ASSERT(isAbsolutePath(baseDir)); - return QDir::cleanPath(baseDir.left(2) + fileName); + return isAbsolutePath(baseDir) ? QDir::cleanPath(baseDir.left(2) + fileName) + : QDir::cleanPath(fileName); } #endif // Q_OS_WIN return QDir::cleanPath(baseDir + QLatin1Char('/') + fileName); -- cgit v1.2.3