andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

When merging NewOperation and CreateFileSystemOperation, don't delete the old 

FS before trying to clone it.

BUG: 171971

svn path=/trunk/playground/sysadmin/partitionmanager/; revision=866672
This commit is contained in:
Volker Lanz 2008-10-01 16:21:13 +00:00
parent d8791eb862
commit 2084e004c4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/operationstack.cpp
View File

@ -167,8 +167,12 @@ bool OperationStack::mergeNewOperation(Operation*& currentOp, Operation*& pushed
{
log() << i18nc("@info/plain", "Changing file system for a new partition: No new operation required.");
newOp->newPartition().deleteFileSystem();
newOp->newPartition().setFileSystem(FileSystemFactory::cloneWithNewType(pushedCreateFileSystemOp->newFileSystem()->type(), newOp->newPartition().fileSystem()));
FileSystem* oldFs = &newOp->newPartition().fileSystem();
newOp->newPartition().setFileSystem(FileSystemFactory::cloneWithNewType(pushedCreateFileSystemOp->newFileSystem()->type(), *oldFs));
delete oldFs;
oldFs = NULL;
delete pushedOp;
pushedOp = NULL;