check for correct alignment only after the partition table type has been set

svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1095436
This commit is contained in:
Volker Lanz 2010-02-24 10:44:11 +00:00
parent ed5c0da0ba
commit fe975b9dfb
1 changed files with 6 additions and 2 deletions

View File

@ -257,6 +257,8 @@ static void scanDevicePartitions(PedDevice* pedDevice, Device& d, PedDisk* pedDi
KMountPoint::List mountPoints = KMountPoint::currentMountPoints(KMountPoint::NeedRealDeviceName);
mountPoints.append(KMountPoint::possibleMountPoints(KMountPoint::NeedRealDeviceName));
QList<Partition*> partitions;
while ((pedPartition = ped_disk_next_partition(pedDisk, pedPartition)))
{
if (pedPartition->num < 1)
@ -307,8 +309,7 @@ static void scanDevicePartitions(PedDevice* pedDevice, Device& d, PedDisk* pedDi
fs->setUUID(fs->readUUID(part->deviceNode()));
parent->append(part);
PartitionTable::isSnapped(d, *part);
partitions.append(part);
}
d.partitionTable()->updateUnallocated(d);
@ -316,6 +317,9 @@ static void scanDevicePartitions(PedDevice* pedDevice, Device& d, PedDisk* pedDi
if (d.partitionTable()->isVistaDiskLabel())
d.partitionTable()->setType(d, PartitionTable::msdos_vista);
foreach(const Partition* part, partitions)
PartitionTable::isSnapped(d, *part);
ped_disk_destroy(pedDisk);
}