devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix nano2g bootloader uninstallation.

Browse source 
Check the correct image when looking for the Ipod firmware version. On nano2g
this is a different image.

Change-Id: Ic7981363399d44e03247a81277522bc1d271090a
This commit is contained in:
Dominik Riebeling 2012-07-01 11:50:36 +02:00
parent 052b5f1da9
commit a455f5901a
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rbutil/rbutilqt/base/bootloaderinstallipod.cpp
View file

@ -68,7 +68,7 @@ bool BootloaderInstallIpod::install(void)
} }
if(getmodel(&ipod,(ipod.ipod_directory[ipod.ososimage].vers>>8)) < 0) { if(getmodel(&ipod,(ipod.ipod_directory[ipod.ososimage].vers>>8)) < 0) {
emit logItem(tr("Unknown version number in firmware (%1)").arg( emit logItem(tr("Unknown version number in firmware (%1)").arg(
ipod.ipod_directory[0].vers), LOGERROR); ipod.ipod_directory[ipod.ososimage].vers), LOGERROR);
emit done(true); emit done(true);
return false; return false;
} }
@ -153,9 +153,9 @@ bool BootloaderInstallIpod::uninstall(void)
emit done(true); emit done(true);
return false; return false;
} }
if (getmodel(&ipod,(ipod.ipod_directory[0].vers>>8)) < 0) { if (getmodel(&ipod,(ipod.ipod_directory[ipod.ososimage].vers>>8)) < 0) {
emit logItem(tr("Unknown version number in firmware (%1)").arg( emit logItem(tr("Unknown version number in firmware (%1)").arg(
ipod.ipod_directory[0].vers), LOGERROR); ipod.ipod_directory[ipod.ososimage].vers), LOGERROR);
emit done(true); emit done(true);
return false; return false;
} }