From 9ce98047ff565d235ce9499fddb76995b10845ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 27 Feb 2019 20:23:30 +0100 Subject: [PATCH] tdehwlib: Fix the flag setting whether the storage device contains the file system. This resolves bug 2232, bug 2607 and bug 2946. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit dfe3c9649f649f2dbd7eac60e3847d4e978e24f4) --- tdecore/tdehw/tdehardwaredevices.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp index 95261d0a9..ac00037b1 100644 --- a/tdecore/tdehw/tdehardwaredevices.cpp +++ b/tdecore/tdehw/tdehardwaredevices.cpp @@ -2697,7 +2697,7 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist diskstatus = diskstatus | TDEDiskDeviceStatus::Hotpluggable; } - if ((filesystemtype.upper() != "CRYPTO_LUKS") && (filesystemtype.upper() != "CRYPTO") && (filesystemtype.upper() != "SWAP") && (!filesystemtype.isNull())) { + if ((filesystemtype.upper() != "CRYPTO_LUKS") && (filesystemtype.upper() != "CRYPTO") && (filesystemtype.upper() != "SWAP") && (!filesystemtype.isEmpty())) { diskstatus = diskstatus | TDEDiskDeviceStatus::ContainsFilesystem; } else {