diff options
Diffstat (limited to 'rbutil/rbutilqt/base/bootloaderinstallsansa.cpp')
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallsansa.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp index 48bd0053ee..0dc94c553c 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp | |||
@@ -242,15 +242,19 @@ BootloaderInstallBase::BootloaderType BootloaderInstallSansa::installed(void) | |||
242 | bool BootloaderInstallSansa::sansaInitialize(struct sansa_t *sansa) | 242 | bool BootloaderInstallSansa::sansaInitialize(struct sansa_t *sansa) |
243 | { | 243 | { |
244 | if(!m_blfile.isEmpty()) { | 244 | if(!m_blfile.isEmpty()) { |
245 | QString devicename = Autodetection::resolveDevicename(m_blfile); | ||
246 | if(devicename.isEmpty()) { | ||
247 | emit logItem(tr("Error: could not retrieve device name"), LOGERROR); | ||
248 | return false; | ||
249 | } | ||
245 | #if defined(Q_OS_WIN32) | 250 | #if defined(Q_OS_WIN32) |
246 | sprintf(sansa->diskname, "\\\\.\\PhysicalDrive%i", | 251 | sprintf(sansa->diskname, "\\\\.\\PhysicalDrive%i", devicename.toInt()); |
247 | Autodetection::resolveDevicename(m_blfile).toInt()); | ||
248 | #elif defined(Q_OS_MACX) | 252 | #elif defined(Q_OS_MACX) |
249 | sprintf(sansa->diskname, | 253 | sprintf(sansa->diskname, |
250 | qPrintable(Autodetection::resolveDevicename(m_blfile).remove(QRegExp("s[0-9]+$")))); | 254 | qPrintable(devicename.remove(QRegExp("s[0-9]+$")))); |
251 | #else | 255 | #else |
252 | sprintf(sansa->diskname, | 256 | sprintf(sansa->diskname, |
253 | qPrintable(Autodetection::resolveDevicename(m_blfile).remove(QRegExp("[0-9]+$")))); | 257 | qPrintable(devicename.remove(QRegExp("[0-9]+$")))); |
254 | #endif | 258 | #endif |
255 | qDebug() << "[BootloaderInstallSansa] sansapatcher: overriding scan, using" | 259 | qDebug() << "[BootloaderInstallSansa] sansapatcher: overriding scan, using" |
256 | << sansa->diskname; | 260 | << sansa->diskname; |