diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-09-18 23:30:15 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-09-18 23:37:39 +0200 |
commit | 5d9086bcbefeb182071d418a896f9868ffd20b60 (patch) | |
tree | 20ef82e75d0750c802b4d5ad67c800a6522314a3 /rbutil/rbutilqt/configure.cpp | |
parent | 5c31063a3fb668ffae6539e3541bc310cb0008f6 (diff) | |
download | rockbox-5d9086bcbefeb182071d418a896f9868ffd20b60.tar.gz 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.cpp | 6 |
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() | |||
765 | QMessageBox::Ok ,QMessageBox::Ok); | 765 | QMessageBox::Ok ,QMessageBox::Ok); |
766 | ui.treeDevices->setEnabled(true); | 766 | ui.treeDevices->setEnabled(true); |
767 | } | 767 | } |
768 | else if(detected.at(0).status != Autodetection::PlayerOk) { | 768 | else if(detected.at(0).status != Autodetection::PlayerOk |
769 | && detected.at(0).status != Autodetection::PlayerAmbiguous) { | ||
769 | QString msg; | 770 | QString msg; |
770 | switch(detected.at(0).status) { | 771 | switch(detected.at(0).status) { |
771 | case Autodetection::PlayerIncompatible: | 772 | case Autodetection::PlayerIncompatible: |
@@ -796,9 +797,8 @@ void Config::autodetect() | |||
796 | } | 797 | } |
797 | break; | 798 | break; |
798 | case Autodetection::PlayerError: | 799 | case Autodetection::PlayerError: |
799 | msg += tr("An unknown error occured during player detection."); | ||
800 | break; | ||
801 | default: | 800 | default: |
801 | msg += tr("An unknown error occured during player detection."); | ||
802 | break; | 802 | break; |
803 | } | 803 | } |
804 | QMessageBox::information(this, tr("Device Detection"), msg); | 804 | QMessageBox::information(this, tr("Device Detection"), msg); |