diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-06-30 19:01:51 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-06-30 19:01:51 +0000 |
commit | 08574c43d314cf9ac189e2d2c6467bca6ed9e97e (patch) | |
tree | 8e5e8d9e9ff725a97e18ceae94920bb3d7c401ce /rbutil/ipodpatcher/ipodpatcher.c | |
parent | 97a143279b78799d722e3f992e1a59e32ef3c489 (diff) | |
download | rockbox-08574c43d314cf9ac189e2d2c6467bca6ed9e97e.tar.gz rockbox-08574c43d314cf9ac189e2d2c6467bca6ed9e97e.zip |
When scanning for Ipod / Sansa close the disc handle of every tried disc, not only for successful checks. Fixes "no Sansa found" issues with rbutil on w32 after autodetection was used.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17893 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/ipodpatcher/ipodpatcher.c')
-rw-r--r-- | rbutil/ipodpatcher/ipodpatcher.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/rbutil/ipodpatcher/ipodpatcher.c b/rbutil/ipodpatcher/ipodpatcher.c index 2177320f2a..73467dea34 100644 --- a/rbutil/ipodpatcher/ipodpatcher.c +++ b/rbutil/ipodpatcher/ipodpatcher.c | |||
@@ -1292,23 +1292,28 @@ int ipod_scan(struct ipod_t* ipod) | |||
1292 | if(result == -2) { | 1292 | if(result == -2) { |
1293 | denied++; | 1293 | denied++; |
1294 | } | 1294 | } |
1295 | ipod_close(ipod); | ||
1295 | continue; | 1296 | continue; |
1296 | } | 1297 | } |
1297 | 1298 | ||
1298 | if (read_partinfo(ipod,1) < 0) { | 1299 | if (read_partinfo(ipod,1) < 0) { |
1300 | ipod_close(ipod); | ||
1299 | continue; | 1301 | continue; |
1300 | } | 1302 | } |
1301 | 1303 | ||
1302 | if ((ipod->pinfo[0].start==0) || (ipod->pinfo[0].type != 0)) { | 1304 | if ((ipod->pinfo[0].start==0) || (ipod->pinfo[0].type != 0)) { |
1305 | ipod_close(ipod); | ||
1303 | continue; | 1306 | continue; |
1304 | } | 1307 | } |
1305 | 1308 | ||
1306 | if (read_directory(ipod) < 0) { | 1309 | if (read_directory(ipod) < 0) { |
1310 | ipod_close(ipod); | ||
1307 | continue; | 1311 | continue; |
1308 | } | 1312 | } |
1309 | 1313 | ||
1310 | ipod_version=(ipod->ipod_directory[0].vers>>8); | 1314 | ipod_version=(ipod->ipod_directory[0].vers>>8); |
1311 | if (getmodel(ipod,ipod_version) < 0) { | 1315 | if (getmodel(ipod,ipod_version) < 0) { |
1316 | ipod_close(ipod); | ||
1312 | continue; | 1317 | continue; |
1313 | } | 1318 | } |
1314 | 1319 | ||