From a77c0fe4a752f3a0ed9f5c813ffd902b8bdbec74 Mon Sep 17 00:00:00 2001 From: Volker Lanz Date: Wed, 18 Jan 2012 10:47:42 +0000 Subject: [PATCH] set FS support for parted backend only if the file system code itself hasn't set support svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1274431 --- src/plugins/libparted/libpartedbackend.cpp | 23 ++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/plugins/libparted/libpartedbackend.cpp b/src/plugins/libparted/libpartedbackend.cpp index ddcf45b..40f091f 100644 --- a/src/plugins/libparted/libpartedbackend.cpp +++ b/src/plugins/libparted/libpartedbackend.cpp @@ -290,12 +290,23 @@ LibPartedBackend::LibPartedBackend(QObject*, const QList&) : void LibPartedBackend::initFSSupport() { #if defined LIBPARTED_FILESYSTEM_SUPPORT - FS::fat16::m_Shrink = FileSystem::cmdSupportBackend; - FS::fat16::m_Grow = FileSystem::cmdSupportBackend; - FS::hfs::m_Shrink = FileSystem::cmdSupportBackend; - FS::hfsplus::m_Shrink = FileSystem::cmdSupportBackend; - FS::hfs::m_GetUsed = FileSystem::cmdSupportBackend; - FS::hfsplus::m_GetUsed = FileSystem::cmdSupportBackend; + if (FS::fat16::m_Shrink == FileSystem::cmdSupportNone) + FS::fat16::m_Shrink = FileSystem::cmdSupportBackend; + + if (FS::fat16::m_Grow == FileSystem::cmdSupportNone) + FS::fat16::m_Grow = FileSystem::cmdSupportBackend; + + if (FS::hfs::m_Shrink == FileSystem::cmdSupportNone) + FS::hfs::m_Shrink = FileSystem::cmdSupportBackend; + + if (FS::hfsplus::m_Shrink == FileSystem::cmdSupportNone) + FS::hfsplus::m_Shrink = FileSystem::cmdSupportBackend; + + if (FS::hfs::m_GetUsed == FileSystem::cmdSupportNone) + FS::hfs::m_GetUsed = FileSystem::cmdSupportBackend; + + if (FS::hfsplus::m_GetUsed == FileSystem::cmdSupportNone) + FS::hfsplus::m_GetUsed = FileSystem::cmdSupportBackend; #endif }