summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/base/autodetection.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2010-04-27 21:43:14 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2010-04-27 21:43:14 +0000
commit34e60dde601e509ad2528e3078229bb85de693c9 (patch)
tree6577175a1546ebf7fbc58f1bef670d520da50f57 /rbutil/rbutilqt/base/autodetection.cpp
parentb6e1f1c0ad3153c2193cb3ba04857d5a5bced296 (diff)
downloadrockbox-34e60dde601e509ad2528e3078229bb85de693c9.tar.gz
rockbox-34e60dde601e509ad2528e3078229bb85de693c9.zip
Handle device name resolving failures.
Improve tracing of device name resolving. Explicitly fail if resolving the device name from the mountpoint failed during ipod / sansa bootloader installation. Fixes bootloader installation trying to use an empty device name in some cases which can happen if the mountpoint to get resolved uses an incompatible file system. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25743 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/base/autodetection.cpp')
-rw-r--r--rbutil/rbutilqt/base/autodetection.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/base/autodetection.cpp b/rbutil/rbutilqt/base/autodetection.cpp
index ab2b1bd05c..695cb6a204 100644
--- a/rbutil/rbutilqt/base/autodetection.cpp
+++ b/rbutil/rbutilqt/base/autodetection.cpp
@@ -339,13 +339,14 @@ QString Autodetection::resolveMountPoint(QString device)
339 for(letter = 'A'; letter <= 'Z'; letter++) { 339 for(letter = 'A'; letter <= 'Z'; letter++) {
340 if(resolveDevicename(QString(letter)).toUInt() == driveno) { 340 if(resolveDevicename(QString(letter)).toUInt() == driveno) {
341 result = letter; 341 result = letter;
342 qDebug() << "[Autodetect] resolved mountpoint is:" << result;
342 break; 343 break;
343 } 344 }
344 } 345 }
345 qDebug() << "[Autodetect] resolved mountpoint is:" << result;
346 if(!result.isEmpty()) 346 if(!result.isEmpty())
347 return result + ":/"; 347 return result + ":/";
348#endif 348#endif
349 qDebug() << "[Autodetect] resolving mountpoint failed!";
349 return QString(""); 350 return QString("");
350} 351}
351 352