Adapted according to the semantics change for the identify()/scan()/free_identify_cookie() disk system hooks.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12189 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
0a0a999076
commit
79757df990
@ -100,6 +100,7 @@ KScanPartitionJob::_ScanPartition(KPartition *partition)
|
|||||||
} else {
|
} else {
|
||||||
// disk system doesn't identify the partition or worse than our
|
// disk system doesn't identify the partition or worse than our
|
||||||
// current favorite
|
// current favorite
|
||||||
|
if (priority >= 0)
|
||||||
diskSystem->FreeIdentifyCookie(partition, cookie);
|
diskSystem->FreeIdentifyCookie(partition, cookie);
|
||||||
diskSystem->Unload();
|
diskSystem->Unload();
|
||||||
}
|
}
|
||||||
@ -109,6 +110,7 @@ KScanPartitionJob::_ScanPartition(KPartition *partition)
|
|||||||
if (bestDiskSystem) {
|
if (bestDiskSystem) {
|
||||||
DBG(OUT(" scanning with: %s\n", bestDiskSystem->Name()));
|
DBG(OUT(" scanning with: %s\n", bestDiskSystem->Name()));
|
||||||
error = bestDiskSystem->Scan(partition, bestCookie);
|
error = bestDiskSystem->Scan(partition, bestCookie);
|
||||||
|
bestDiskSystem->FreeIdentifyCookie(partition, bestCookie);
|
||||||
if (error == B_OK) {
|
if (error == B_OK) {
|
||||||
partition->SetDiskSystem(bestDiskSystem);
|
partition->SetDiskSystem(bestDiskSystem);
|
||||||
for (int32 i = 0; KPartition *child = partition->ChildAt(i); i++)
|
for (int32 i = 0; KPartition *child = partition->ChildAt(i); i++)
|
||||||
|
Loading…
Reference in New Issue
Block a user