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

Check for existing lastpath file before Crostini warning

Browse Source
This commit is contained in:
Phil Olynyk 2020-11-15 23:38:12 -05:00
parent 3ec5a4dd47
commit a637bea0fe
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
oscar/mainwindow.cpp
View File

@ -856,9 +856,6 @@ QStringList getDriveList()
drivelist.append(dir.filePath() ); drivelist.append(dir.filePath() );
} }
} else { } else {
QMessageBox::warning(nullptr, STR_MessageBox_Warning,
QObject::tr("Chromebook file system detected, but no removable device found\n") +
QObject::tr("You must share your SD card with Linux using the ChromeOS Files program"));
drivelist.clear(); drivelist.clear();
drivelist.append("CROSTINI"); drivelist.append("CROSTINI");
} }
@ -917,8 +914,19 @@ QList<ImportPath> MainWindow::detectCPAPCards()
do { do {
// Rescan in case card inserted // Rescan in case card inserted
QStringList AutoScannerPaths = getDriveList(); QStringList AutoScannerPaths = getDriveList();
if (AutoScannerPaths.contains("CROSTINI")) // no Crostini removable drives found! if (AutoScannerPaths.contains("CROSTINI")) { // no Crostini removable drives found!
if (( lastpath.size() > 0) && ( ! AutoScannerPaths.contains(lastpath))) {
if (QFile(lastpath).exists() ) {
AutoScannerPaths.insert(0, lastpath);
}
}
else {
QMessageBox::warning(nullptr, STR_MessageBox_Warning,
QObject::tr("Chromebook file system detected, but no removable device found\n") +
QObject::tr("You must share your SD card with Linux using the ChromeOS Files program"));
break; // break out of the 20 second wait loop break; // break out of the 20 second wait loop
}
}
// AutoScannerPaths.push_back(lastpath); // AutoScannerPaths.push_back(lastpath);
qDebug() << "Drive list size:" << AutoScannerPaths.size(); qDebug() << "Drive list size:" << AutoScannerPaths.size();