chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct Mac define value and drop tmpfs from qDebug output

Browse Source
This commit is contained in:
Phil Olynyk 2020-06-09 22:11:34 -04:00
parent 80a5642ee3
commit c2c61c6629
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
oscar/mainwindow.cpp
View File

@ -806,14 +806,16 @@ QStringList getDriveList()
#elif defined(Q_OS_WIN #elif defined(Q_OS_WIN
#define VFAT "FAT32" #define VFAT "FAT32"
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC)
#define VFAT "FAT32" #define VFAT "msdos"
#endif #endif
foreach (const QStorageInfo &storage, QStorageInfo::mountedVolumes()) { foreach (const QStorageInfo &storage, QStorageInfo::mountedVolumes()) {
if (storage.isValid() && storage.isReady()) { if (storage.isValid() && storage.isReady()) {
qDebug() << "Device:" << storage.device(); if (storage.fileSystemType() != "tmpfs") { // Don't show all the Linux tmpfs mount points!
qDebug() << " Path:" << storage.rootPath(); qDebug() << "Device:" << storage.device();
qDebug() << " Name:" << storage.name(); // ... qDebug() << " Path:" << storage.rootPath();
qDebug() << " FS Type:" << storage.fileSystemType(); qDebug() << " Name:" << storage.name(); // ...
qDebug() << " FS Type:" << storage.fileSystemType();
}
if (storage.fileSystemType() == VFAT) { if (storage.fileSystemType() == VFAT) {
qDebug() << "Adding" << storage.name() << "on" << storage.rootPath() << "to drivelist"; qDebug() << "Adding" << storage.name() << "on" << storage.rootPath() << "to drivelist";
drivelist.push_back(storage.rootPath()); drivelist.push_back(storage.rootPath());