parent
96eaf6abae
commit
4278172f35
|
@ -408,23 +408,26 @@ void OperationStack::push(Operation* o)
|
||||||
{
|
{
|
||||||
Q_ASSERT(o);
|
Q_ASSERT(o);
|
||||||
|
|
||||||
foreach(Operation * currentOp, operations()) {
|
auto currentOp = operations().end();
|
||||||
if (mergeNewOperation(currentOp, o))
|
while (currentOp != operations().begin())
|
||||||
|
{
|
||||||
|
--currentOp;
|
||||||
|
if (mergeNewOperation(*currentOp, o))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (mergeCopyOperation(currentOp, o))
|
if (mergeCopyOperation(*currentOp, o))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (mergeRestoreOperation(currentOp, o))
|
if (mergeRestoreOperation(*currentOp, o))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (mergePartFlagsOperation(currentOp, o))
|
if (mergePartFlagsOperation(*currentOp, o))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (mergePartLabelOperation(currentOp, o))
|
if (mergePartLabelOperation(*currentOp, o))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (mergeCreatePartitionTableOperation(currentOp, o))
|
if (mergeCreatePartitionTableOperation(*currentOp, o))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue