From a455f5901aab95eda4f22bb36796baa2eedfa8da Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 1 Jul 2012 11:50:36 +0200 Subject: Fix nano2g bootloader uninstallation. Check the correct image when looking for the Ipod firmware version. On nano2g this is a different image. Change-Id: Ic7981363399d44e03247a81277522bc1d271090a --- rbutil/rbutilqt/base/bootloaderinstallipod.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rbutil') diff --git a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp index 15289c0ef8..cb69faa35b 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp @@ -68,7 +68,7 @@ bool BootloaderInstallIpod::install(void) } if(getmodel(&ipod,(ipod.ipod_directory[ipod.ososimage].vers>>8)) < 0) { 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); return false; } @@ -153,9 +153,9 @@ bool BootloaderInstallIpod::uninstall(void) emit done(true); 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( - ipod.ipod_directory[0].vers), LOGERROR); + ipod.ipod_directory[ipod.ososimage].vers), LOGERROR); emit done(true); return false; } -- cgit v1.2.3