summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallipod.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
index 117783890c..0e374a9699 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
@@ -73,7 +73,7 @@ bool BootloaderInstallIpod::install(void)
73 } 73 }
74 74
75 if(ipod.macpod) { 75 if(ipod.macpod) {
76 emit logItem(tr("Warning: This is a MacPod, Rockbox only runs on WinPods.\n" 76 emit logItem(tr("Warning: This is a MacPod, Rockbox only runs on WinPods. \n"
77 "See http://www.rockbox.org/wiki/IpodConversionToFAT32"), LOGERROR); 77 "See http://www.rockbox.org/wiki/IpodConversionToFAT32"), LOGERROR);
78 emit done(true); 78 emit done(true);
79 return false; 79 return false;
@@ -112,7 +112,7 @@ void BootloaderInstallIpod::installStage2(void)
112 } 112 }
113 113
114 if(ipod.macpod) { 114 if(ipod.macpod) {
115 emit logItem(tr("Warning: This is a MacPod, Rockbox only runs on WinPods.\n" 115 emit logItem(tr("Warning: This is a MacPod, Rockbox only runs on WinPods. \n"
116 "See http://www.rockbox.org/wiki/IpodConversionToFAT32"), LOGERROR); 116 "See http://www.rockbox.org/wiki/IpodConversionToFAT32"), LOGERROR);
117 emit done(true); 117 emit done(true);
118 return; 118 return;
@@ -235,11 +235,11 @@ bool BootloaderInstallIpod::ipodInitialize(struct ipod_t *ipod)
235 sprintf(ipod->diskname, "\\\\.\\PhysicalDrive%i", 235 sprintf(ipod->diskname, "\\\\.\\PhysicalDrive%i",
236 Autodetection::resolveDevicename(m_blfile).toInt()); 236 Autodetection::resolveDevicename(m_blfile).toInt());
237#elif defined(Q_OS_MACX) 237#elif defined(Q_OS_MACX)
238 sprintf(ipod->diskname, 238 sprintf(ipod->diskname, "%s",
239 qPrintable(Autodetection::resolveDevicename(m_blfile) 239 qPrintable(Autodetection::resolveDevicename(m_blfile)
240 .remove(QRegExp("s[0-9]+$")))); 240 .remove(QRegExp("s[0-9]+$"))));
241#else 241#else
242 sprintf(ipod->diskname, 242 sprintf(ipod->diskname, "%s",
243 qPrintable(Autodetection::resolveDevicename(m_blfile) 243 qPrintable(Autodetection::resolveDevicename(m_blfile)
244 .remove(QRegExp("[0-9]+$")))); 244 .remove(QRegExp("[0-9]+$"))));
245#endif 245#endif