fix(cpn): sometimes processes wrong SD card path (#5978)

This commit is contained in:
Peter Feerick
2025-03-09 13:10:31 +10:00
committed by GitHub
parent 8cd511e6c3
commit ced9dedcb0
+9 -5
View File
@@ -299,8 +299,8 @@ bool writeSettings(const QString & filename, ProgressWidget * progress)
QString findMassstoragePath(const QString & filename, bool onlyPath, ProgressWidget *progress) QString findMassstoragePath(const QString & filename, bool onlyPath, ProgressWidget *progress)
{ {
QString temppath; QString foundPath;
QString probefile; QString foundProbefile;
int found = 0; int found = 0;
QRegularExpression fstypeRe("^(v?fat|msdos|lifs)", QRegularExpression::CaseInsensitiveOption); // Linux: "vfat"; macOS: "msdos" or "lifs"; Win: "FAT32" QRegularExpression fstypeRe("^(v?fat|msdos|lifs)", QRegularExpression::CaseInsensitiveOption); // Linux: "vfat"; macOS: "msdos" or "lifs"; Win: "FAT32"
@@ -309,17 +309,21 @@ QString findMassstoragePath(const QString & filename, bool onlyPath, ProgressWid
//qDebug() << si.rootPath() << si.name() << si.device() << si.displayName() << si.fileSystemType() << si.isReady() << si.bytesTotal() << si.blockSize(); //qDebug() << si.rootPath() << si.name() << si.device() << si.displayName() << si.fileSystemType() << si.isReady() << si.bytesTotal() << si.blockSize();
if (!si.isReady() || si.isReadOnly() || !QString(si.fileSystemType()).contains(fstypeRe)) if (!si.isReady() || si.isReadOnly() || !QString(si.fileSystemType()).contains(fstypeRe))
continue; continue;
temppath = si.rootPath();
probefile = temppath % "/" % filename; QString temppath = si.rootPath();
QString probefile = temppath % "/" % filename;
qDebug() << "Searching for" << probefile; qDebug() << "Searching for" << probefile;
if (QFile::exists(probefile)) { if (QFile::exists(probefile)) {
found++; found++;
foundPath = temppath;
foundProbefile = probefile;
qDebug() << probefile << "found"; qDebug() << probefile << "found";
} }
} }
if (found == 1) if (found == 1)
return onlyPath ? temppath : probefile; return onlyPath ? foundPath : foundProbefile;
else if (found > 1) { else if (found > 1) {
QMessageBox::critical(progress, CPN_STR_TTL_ERROR, filename % " " % QCoreApplication::translate("RadioInterface", "found in multiple locations")); QMessageBox::critical(progress, CPN_STR_TTL_ERROR, filename % " " % QCoreApplication::translate("RadioInterface", "found in multiple locations"));
} }