Use QFile::decodeFileName for decoding device node names.
BUG: 384321
This commit is contained in:
parent
0cb3c79726
commit
0c25d1f9c4
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
SPDX-FileCopyrightText: 2008-2010 Volker Lanz <vl@fidra.de>
|
SPDX-FileCopyrightText: 2008-2010 Volker Lanz <vl@fidra.de>
|
||||||
SPDX-FileCopyrightText: 2008 Laurent Montel <montel@kde.org>
|
SPDX-FileCopyrightText: 2008 Laurent Montel <montel@kde.org>
|
||||||
SPDX-FileCopyrightText: 2013-2018 Andrius Štikonas <andrius@stikonas.eu>
|
SPDX-FileCopyrightText: 2013-2020 Andrius Štikonas <andrius@stikonas.eu>
|
||||||
SPDX-FileCopyrightText: 2015-2016 Teo Mrnjavac <teo@kde.org>
|
SPDX-FileCopyrightText: 2015-2016 Teo Mrnjavac <teo@kde.org>
|
||||||
SPDX-FileCopyrightText: 2016 Chantara Tith <tith.chantara@gmail.com>
|
SPDX-FileCopyrightText: 2016 Chantara Tith <tith.chantara@gmail.com>
|
||||||
|
|
||||||
|
@ -19,6 +19,7 @@
|
||||||
#include "util/externalcommand.h"
|
#include "util/externalcommand.h"
|
||||||
#include "util/report.h"
|
#include "util/report.h"
|
||||||
|
|
||||||
|
#include <QFile>
|
||||||
#include <QRegularExpression>
|
#include <QRegularExpression>
|
||||||
#include <QStorageInfo>
|
#include <QStorageInfo>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
@ -329,7 +330,7 @@ bool Partition::unmount(Report& report)
|
||||||
const QString canonicalDeviceNode = QFileInfo(deviceNode()).canonicalFilePath();
|
const QString canonicalDeviceNode = QFileInfo(deviceNode()).canonicalFilePath();
|
||||||
const QList<QStorageInfo> mountedVolumes = QStorageInfo::mountedVolumes();
|
const QList<QStorageInfo> mountedVolumes = QStorageInfo::mountedVolumes();
|
||||||
for (const QStorageInfo &storage : mountedVolumes) {
|
for (const QStorageInfo &storage : mountedVolumes) {
|
||||||
if (QFileInfo(QString::fromLocal8Bit(storage.device())).canonicalFilePath() == canonicalDeviceNode ) {
|
if (QFileInfo(QFile::decodeName(storage.device())).canonicalFilePath() == canonicalDeviceNode ) {
|
||||||
success = false;
|
success = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
SPDX-FileCopyrightText: 2008-2011 Volker Lanz <vl@fidra.de>
|
SPDX-FileCopyrightText: 2008-2011 Volker Lanz <vl@fidra.de>
|
||||||
SPDX-FileCopyrightText: 2012-2019 Andrius Štikonas <andrius@stikonas.eu>
|
SPDX-FileCopyrightText: 2012-2020 Andrius Štikonas <andrius@stikonas.eu>
|
||||||
SPDX-FileCopyrightText: 2015-2016 Teo Mrnjavac <teo@kde.org>
|
SPDX-FileCopyrightText: 2015-2016 Teo Mrnjavac <teo@kde.org>
|
||||||
SPDX-FileCopyrightText: 2016 Chantara Tith <tith.chantara@gmail.com>
|
SPDX-FileCopyrightText: 2016 Chantara Tith <tith.chantara@gmail.com>
|
||||||
SPDX-FileCopyrightText: 2017 Pali Rohár <pali.rohar@gmail.com>
|
SPDX-FileCopyrightText: 2017 Pali Rohár <pali.rohar@gmail.com>
|
||||||
|
@ -27,6 +27,7 @@
|
||||||
#include <KLocalizedString>
|
#include <KLocalizedString>
|
||||||
|
|
||||||
#include <QColor>
|
#include <QColor>
|
||||||
|
#include <QFile>
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
#include <QStandardPaths>
|
#include <QStandardPaths>
|
||||||
#include <QStorageInfo>
|
#include <QStorageInfo>
|
||||||
|
@ -154,7 +155,7 @@ QString FileSystem::detectMountPoint(FileSystem* fs, const QString& partitionPat
|
||||||
QString partitionCanonicalPath = partitionPathFileInfo.canonicalFilePath();
|
QString partitionCanonicalPath = partitionPathFileInfo.canonicalFilePath();
|
||||||
const QList<QStorageInfo> mountedVolumes = QStorageInfo::mountedVolumes();
|
const QList<QStorageInfo> mountedVolumes = QStorageInfo::mountedVolumes();
|
||||||
for (const QStorageInfo &storage : mountedVolumes) {
|
for (const QStorageInfo &storage : mountedVolumes) {
|
||||||
if (partitionCanonicalPath == QFileInfo(QString::fromLocal8Bit(storage.device())).canonicalFilePath() ) {
|
if (partitionCanonicalPath == QFileInfo(QFile::decodeName(storage.device())).canonicalFilePath() ) {
|
||||||
mountPoints.append(storage.rootPath());
|
mountPoints.append(storage.rootPath());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue