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

Bad: lastpath is undef for not-Linux

Browse Source
This commit is contained in:
Phil Olynyk 2020-03-30 16:37:43 -04:00
parent 1e82500685
commit 13ba9aba48
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
oscar/mainwindow.cpp
View File

@ -829,9 +829,18 @@ void ImportDialogScan::cancelbutton()
QList<ImportPath> MainWindow::detectCPAPCards() QList<ImportPath> MainWindow::detectCPAPCards()
{ {
const int timeout = 20000; const int timeout = 20000; // twenty seconds
QList<ImportPath> detectedCards; QList<ImportPath> detectedCards;
importScanCancelled = false;
#if defined (Q_OS_LINUX)
QString lastpath = (*p_profile)[STR_PREF_LastCPAPPath].toString();
if (detectedCards.size() == 0) {
qDebug() << "Skipping card detection on Linux";
return detectedCards;
}
#endif
QList<MachineLoader *>loaders = GetLoaders(MT_CPAP); QList<MachineLoader *>loaders = GetLoaders(MT_CPAP);
QTime time; QTime time;
@ -860,18 +869,19 @@ QList<ImportPath> MainWindow::detectCPAPCards()
progress.setValue(0); progress.setValue(0);
progress.setMaximum(timeout); progress.setMaximum(timeout);
progress.setVisible(true); progress.setVisible(true);
importScanCancelled = false; // importScanCancelled = false;
popup.show(); popup.show();
QApplication::processEvents(); QApplication::processEvents();
QString lastpath = (*p_profile)[STR_PREF_LastCPAPPath].toString(); // QString lastpath = (*p_profile)[STR_PREF_LastCPAPPath].toString();
do { do {
// Rescan in case card inserted // Rescan in case card inserted
QStringList AutoScannerPaths = getDriveList(); QStringList AutoScannerPaths = getDriveList();
//AutoScannerPaths.push_back(lastpath); // AutoScannerPaths.push_back(lastpath);
qDebug() << "Drive list size:" << AutoScannerPaths.size();
if (!AutoScannerPaths.contains(lastpath)) { if ( (lastpath.size()>0) && ( ! AutoScannerPaths.contains(lastpath))) {
AutoScannerPaths.append(lastpath); AutoScannerPaths.insert(0, lastpath);
} }
Q_FOREACH(const QString &path, AutoScannerPaths) { Q_FOREACH(const QString &path, AutoScannerPaths) {
@ -887,10 +897,12 @@ QList<ImportPath> MainWindow::detectCPAPCards()
} }
int el=time.elapsed(); int el=time.elapsed();
progress.setValue(el); progress.setValue(el);
if (el > timeout) break; if (el > timeout)
if (!popup.isVisible()) break; break;
if ( ! popup.isVisible())
break;
// needs a slight delay here // needs a slight delay here
for (int i=0; i<5; ++i) { for (int i=0; i<20; ++i) {
QThread::msleep(50); QThread::msleep(50);
QApplication::processEvents(); QApplication::processEvents();
} }