1 files changed, 17 insertions, 3 deletions

diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp
index acd68aa52d..7416a55ccb 100644
--- a/rbutil/rbutilqt/configure.cpp
+++ b/rbutil/rbutilqt/configure.cpp
@@ -734,9 +734,23 @@ void Config::autodetect()
     this->unsetCursor();
     if(detected.size() > 1) {
         // FIXME: handle multiple found players.
-        QMessageBox::information(this, tr("Device Detection"),
-                tr("Multiple devices have been detected. Please disconnect "
-                   "all players but one and try again."));
+        QString msg;
+        msg = tr("Multiple devices have been detected. Please disconnect "
+                 "all players but one and try again.");
+        msg += "<br/>";
+        msg += tr("Detected devices:");
+        msg += "<ul>";
+        for(int i = 0; i < detected.size(); ++i) {
+            msg += QString("<li>%1</li>").arg(
+                        SystemInfo::platformValue(detected.at(i).device,
+                                      SystemInfo::CurPlatformName).toString());
+        }
+        msg += "</ul>";
+        msg += tr("Note: detecting connected devices might be ambiguous. "
+                  "You might have less devices connected than listed. "
+                  "In this case it might not be possible to detect your "
+                  "player unambiguously.");
+        QMessageBox::information(this, tr("Device Detection"), msg);
         ui.treeDevices->setEnabled(true);
     }
     else if(detected.size() == 0) {