diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-07-01 11:50:36 +0200 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-07-01 12:34:59 +0200 |
| commit | a455f5901aab95eda4f22bb36796baa2eedfa8da (patch) | |
| tree | 9f4ec104b5c6540983f652c03986da86ef1bce0e | |
| parent | 052b5f1da916ac931ea6afebb232839fc913aaba (diff) | |
| download | rockbox-a455f5901aab95eda4f22bb36796baa2eedfa8da.tar.gz rockbox-a455f5901aab95eda4f22bb36796baa2eedfa8da.zip | |
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
| -rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallipod.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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) | |||
| 68 | } | 68 | } |
| 69 | if(getmodel(&ipod,(ipod.ipod_directory[ipod.ososimage].vers>>8)) < 0) { | 69 | if(getmodel(&ipod,(ipod.ipod_directory[ipod.ososimage].vers>>8)) < 0) { |
| 70 | emit logItem(tr("Unknown version number in firmware (%1)").arg( | 70 | emit logItem(tr("Unknown version number in firmware (%1)").arg( |
| 71 | ipod.ipod_directory[0].vers), LOGERROR); | 71 | ipod.ipod_directory[ipod.ososimage].vers), LOGERROR); |
| 72 | emit done(true); | 72 | emit done(true); |
| 73 | return false; | 73 | return false; |
| 74 | } | 74 | } |
| @@ -153,9 +153,9 @@ bool BootloaderInstallIpod::uninstall(void) | |||
| 153 | emit done(true); | 153 | emit done(true); |
| 154 | return false; | 154 | return false; |
| 155 | } | 155 | } |
| 156 | if (getmodel(&ipod,(ipod.ipod_directory[0].vers>>8)) < 0) { | 156 | if (getmodel(&ipod,(ipod.ipod_directory[ipod.ososimage].vers>>8)) < 0) { |
| 157 | emit logItem(tr("Unknown version number in firmware (%1)").arg( | 157 | emit logItem(tr("Unknown version number in firmware (%1)").arg( |
| 158 | ipod.ipod_directory[0].vers), LOGERROR); | 158 | ipod.ipod_directory[ipod.ososimage].vers), LOGERROR); |
| 159 | emit done(true); | 159 | emit done(true); |
| 160 | return false; | 160 | return false; |
| 161 | } | 161 | } |