napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use asynchronous device revert.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-12-23 19:14:47 +01:00
parent dbef198bac
commit cd8b7619d0
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/partition/gui/ChoicePage.cpp
View File

@ -273,7 +273,6 @@ ChoicePage::setupChoices()
if ( currd ) if ( currd )
{ {
applyActionChoice( currentChoice() ); applyActionChoice( currentChoice() );
updateActionChoicePreview( currentChoice() );
} }
} ); } );
} }
@ -437,12 +436,8 @@ ChoicePage::applyActionChoice( ChoicePage::Choice choice )
connect( m_beforePartitionBarsView->selectionModel(), &QItemSelectionModel::currentRowChanged, connect( m_beforePartitionBarsView->selectionModel(), &QItemSelectionModel::currentRowChanged,
this, [ this ]( const QModelIndex& current, const QModelIndex& previous ) this, [ this ]( const QModelIndex& current, const QModelIndex& previous )
{ {
if ( m_core->isDirty() ) auto doReplace = [=]
{ {
m_core->revertDevice( selectedDevice() );
m_core->clearJobs();
}
// We can't use the PartitionPtrRole because we need to make changes to the // We can't use the PartitionPtrRole because we need to make changes to the
// main DeviceModel, not the immutable copy. // main DeviceModel, not the immutable copy.
QString partPath = current.data( PartitionModel::PartitionPathRole ).toString(); QString partPath = current.data( PartitionModel::PartitionPathRole ).toString();
@ -452,12 +447,22 @@ ChoicePage::applyActionChoice( ChoicePage::Choice choice )
PartitionActions::doReplacePartition( m_core, PartitionActions::doReplacePartition( m_core,
selectedDevice(), selectedDevice(),
partition ); partition );
};
if ( m_core->isDirty() )
{
m_core->asyncRevertDevice( selectedDevice(), doReplace );
m_core->clearJobs();
}
else
doReplace();
} ); } );
break; break;
case NoChoice: case NoChoice:
case Manual: case Manual:
break; break;
} }
updateActionChoicePreview( currentChoice() );
} }