summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/configure.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2013-09-18 23:30:15 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2013-09-18 23:37:39 +0200
commit5d9086bcbefeb182071d418a896f9868ffd20b60 (patch)
tree20ef82e75d0750c802b4d5ad67c800a6522314a3 /rbutil/rbutilqt/configure.cpp
parent5c31063a3fb668ffae6539e3541bc310cb0008f6 (diff)
downloadrockbox-5d9086bcbefeb182071d418a896f9868ffd20b60.tar.gz
rockbox-5d9086bcbefeb182071d418a896f9868ffd20b60.tar.bz2
rockbox-5d9086bcbefeb182071d418a896f9868ffd20b60.zip
Handle ambiguous state in configuration dialog.
If a single player is detected it might still have ambiguous as state due to the mountpoint not being found. Make sure to display a sensible error message in that case. Change-Id: I7d62e739019b26a583fe6aab502d0f870e67587e
Diffstat (limited to 'rbutil/rbutilqt/configure.cpp')
-rw-r--r--rbutil/rbutilqt/configure.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp
index 4bcfc41a8b..456e65cdd9 100644
--- a/rbutil/rbutilqt/configure.cpp
+++ b/rbutil/rbutilqt/configure.cpp
@@ -765,7 +765,8 @@ void Config::autodetect()
QMessageBox::Ok ,QMessageBox::Ok);
ui.treeDevices->setEnabled(true);
}
- else if(detected.at(0).status != Autodetection::PlayerOk) {
+ else if(detected.at(0).status != Autodetection::PlayerOk
+ && detected.at(0).status != Autodetection::PlayerAmbiguous) {
QString msg;
switch(detected.at(0).status) {
case Autodetection::PlayerIncompatible:
@@ -796,9 +797,8 @@ void Config::autodetect()
}
break;
case Autodetection::PlayerError:
- msg += tr("An unknown error occured during player detection.");
- break;
default:
+ msg += tr("An unknown error occured during player detection.");
break;
}
QMessageBox::information(this, tr("Device Detection"), msg);