From bf1c491c2b510648a3c1efc2c381e30635248d18 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 1 Jul 2012 12:29:47 +0200 Subject: Move check for existing bootloader to ipodpatcher. Bootloader handling is different on nano2g compared to the other supported Ipod models. Since ipodpatcher handles this internally make ipodpatcher also provide a way to check this when using from Rockbox Utility to avoid duplicating the (already existing) checks in the latter. Fixes wrong "bootloader already installed" message on nano2g. Change-Id: Ibc658d775fbac7cf9a7e329d445fe97828a455d8 --- rbutil/rbutilqt/base/bootloaderinstallipod.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rbutil/rbutilqt') diff --git a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp index cb69faa35b..249da13735 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp @@ -166,7 +166,7 @@ bool BootloaderInstallIpod::uninstall(void) return false; } - if (ipod.ipod_directory[0].entryOffset == 0) { + if (ipod_has_bootloader(&ipod) == 0) { emit logItem(tr("No bootloader detected."), LOGERROR); emit done(true); return false; @@ -199,8 +199,8 @@ BootloaderInstallBase::BootloaderType BootloaderInstallIpod::installed(void) } else { read_directory(&ipod); - if(ipod.ipod_directory[0].entryOffset == 0 || ipod.macpod) { - qDebug() << "[BootloaderInstallIpod] installed: BootloaderOther"; + getmodel(&ipod,(ipod.ipod_directory[ipod.ososimage].vers>>8)); + if(!ipod_has_bootloader(&ipod)) { result = BootloaderOther; } else { -- cgit v1.2.3