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

Iterate over operation stack backwards. 

BUG: 363216
This commit is contained in:
Andrius Štikonas 2016-05-19 16:40:20 +01:00
parent 96eaf6abae
commit 4278172f35
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/operationstack.cpp
View File

@ -408,23 +408,26 @@ void OperationStack::push(Operation* o)
{
Q_ASSERT(o);
foreach(Operation * currentOp, operations()) {
if (mergeNewOperation(currentOp, o))
auto currentOp = operations().end();
while (currentOp != operations().begin())
{
--currentOp;
if (mergeNewOperation(*currentOp, o))
break;
if (mergeCopyOperation(currentOp, o))
if (mergeCopyOperation(*currentOp, o))
break;
if (mergeRestoreOperation(currentOp, o))
if (mergeRestoreOperation(*currentOp, o))
break;
if (mergePartFlagsOperation(currentOp, o))
if (mergePartFlagsOperation(*currentOp, o))
break;
if (mergePartLabelOperation(currentOp, o))
if (mergePartLabelOperation(*currentOp, o))
break;
if (mergeCreatePartitionTableOperation(currentOp, o))
if (mergeCreatePartitionTableOperation(*currentOp, o))
break;
}