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

Make on-action-select rescan also async.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-12-31 14:14:47 +01:00
parent 44bc06eb4c
commit 4039d8d4db
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -428,7 +428,12 @@ ChoicePage::applyActionChoice( ChoicePage::Choice choice )
case Replace: case Replace:
if ( m_core->isDirty() ) if ( m_core->isDirty() )
{ {
m_core->revertDevice( selectedDevice() ); ScanningDialog::run( QtConcurrent::run( [ = ]
{
QMutexLocker locker( &m_coreMutex );
m_core->revertDevice( selectedDevice() );
} ),
this );
} }
connect( m_beforePartitionBarsView->selectionModel(), &QItemSelectionModel::currentRowChanged, connect( m_beforePartitionBarsView->selectionModel(), &QItemSelectionModel::currentRowChanged,
@ -437,10 +442,6 @@ ChoicePage::applyActionChoice( ChoicePage::Choice choice )
ScanningDialog::run( QtConcurrent::run( this, ScanningDialog::run( QtConcurrent::run( this,
&ChoicePage::doReplaceSelectedPartition, &ChoicePage::doReplaceSelectedPartition,
current ), current ),
tr( "Scanning storage devices..." ),
tr( "%1 Partitioning" )
.arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortProductName ) ),
this ); this );
} ); } );
break; break;