From c2c61c6629718eccf55395cf917ca3091f3b3490 Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Tue, 9 Jun 2020 22:11:34 -0400 Subject: [PATCH] Correct Mac define value and drop tmpfs from qDebug output --- oscar/mainwindow.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index 58fa16cd..a26aa52e 100644 --- a/oscar/mainwindow.cpp +++ b/oscar/mainwindow.cpp @@ -806,14 +806,16 @@ QStringList getDriveList() #elif defined(Q_OS_WIN #define VFAT "FAT32" #elif defined(Q_OS_MAC) - #define VFAT "FAT32" + #define VFAT "msdos" #endif foreach (const QStorageInfo &storage, QStorageInfo::mountedVolumes()) { if (storage.isValid() && storage.isReady()) { - qDebug() << "Device:" << storage.device(); - qDebug() << " Path:" << storage.rootPath(); - qDebug() << " Name:" << storage.name(); // ... - qDebug() << " FS Type:" << storage.fileSystemType(); + if (storage.fileSystemType() != "tmpfs") { // Don't show all the Linux tmpfs mount points! + qDebug() << "Device:" << storage.device(); + qDebug() << " Path:" << storage.rootPath(); + qDebug() << " Name:" << storage.name(); // ... + qDebug() << " FS Type:" << storage.fileSystemType(); + } if (storage.fileSystemType() == VFAT) { qDebug() << "Adding" << storage.name() << "on" << storage.rootPath() << "to drivelist"; drivelist.push_back(storage.rootPath());