From 68c846e4397edced20868b2a90d4d1502b919597 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 10 Feb 2022 05:58:40 +0200 Subject: [PATCH] Revert "karchivemanager: workaround for formats without directories entries" This reverts commit b08c3b53641f81a89571090517e568077780402e. --- karchivemanager/karchivemanager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/karchivemanager/karchivemanager.cpp b/karchivemanager/karchivemanager.cpp index 235c7431..373e5721 100644 --- a/karchivemanager/karchivemanager.cpp +++ b/karchivemanager/karchivemanager.cpp @@ -1005,9 +1005,9 @@ KArchiveModelPrivate::KArchiveModelPrivate(QObject *parent) // because altering paths is not easy QString KArchiveModelPrivate::joinDir(const QString &dir1, const QString &dir2) const { if (dir1.isEmpty()) { - return QDir::cleanPath("/" + dir2); + return dir2; } - return QDir::cleanPath(dir1 + "/" + dir2); + return dir1 + "/" + dir2; } QStandardItem* KArchiveModelPrivate::makeColumn(const QString &string) const { @@ -1092,7 +1092,7 @@ void KArchiveModelPrivate::run() { m_interrupt = false; foreach (const KArchiveInfo &info, m_list) { - if (m_interrupt) { + if(m_interrupt) { return; }