|
|
@ -360,7 +360,8 @@ ChoicePage::applyDeviceChoice()
|
|
|
|
|
|
|
|
|
|
|
|
if ( m_core->isDirty() )
|
|
|
|
if ( m_core->isDirty() )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
ScanningDialog::run( QtConcurrent::run( [=] {
|
|
|
|
ScanningDialog::run(
|
|
|
|
|
|
|
|
QtConcurrent::run( [=] {
|
|
|
|
QMutexLocker locker( &m_coreMutex );
|
|
|
|
QMutexLocker locker( &m_coreMutex );
|
|
|
|
m_core->revertAllDevices();
|
|
|
|
m_core->revertAllDevices();
|
|
|
|
} ),
|
|
|
|
} ),
|
|
|
@ -452,7 +453,8 @@ ChoicePage::applyActionChoice( InstallChoice choice )
|
|
|
|
|
|
|
|
|
|
|
|
if ( m_core->isDirty() )
|
|
|
|
if ( m_core->isDirty() )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
ScanningDialog::run( QtConcurrent::run( [=] {
|
|
|
|
ScanningDialog::run(
|
|
|
|
|
|
|
|
QtConcurrent::run( [=] {
|
|
|
|
QMutexLocker locker( &m_coreMutex );
|
|
|
|
QMutexLocker locker( &m_coreMutex );
|
|
|
|
m_core->revertDevice( selectedDevice() );
|
|
|
|
m_core->revertDevice( selectedDevice() );
|
|
|
|
} ),
|
|
|
|
} ),
|
|
|
@ -472,7 +474,8 @@ ChoicePage::applyActionChoice( InstallChoice choice )
|
|
|
|
case InstallChoice::Replace:
|
|
|
|
case InstallChoice::Replace:
|
|
|
|
if ( m_core->isDirty() )
|
|
|
|
if ( m_core->isDirty() )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
ScanningDialog::run( QtConcurrent::run( [=] {
|
|
|
|
ScanningDialog::run(
|
|
|
|
|
|
|
|
QtConcurrent::run( [=] {
|
|
|
|
QMutexLocker locker( &m_coreMutex );
|
|
|
|
QMutexLocker locker( &m_coreMutex );
|
|
|
|
m_core->revertDevice( selectedDevice() );
|
|
|
|
m_core->revertDevice( selectedDevice() );
|
|
|
|
} ),
|
|
|
|
} ),
|
|
|
@ -491,7 +494,8 @@ ChoicePage::applyActionChoice( InstallChoice choice )
|
|
|
|
case InstallChoice::Alongside:
|
|
|
|
case InstallChoice::Alongside:
|
|
|
|
if ( m_core->isDirty() )
|
|
|
|
if ( m_core->isDirty() )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
ScanningDialog::run( QtConcurrent::run( [=] {
|
|
|
|
ScanningDialog::run(
|
|
|
|
|
|
|
|
QtConcurrent::run( [=] {
|
|
|
|
QMutexLocker locker( &m_coreMutex );
|
|
|
|
QMutexLocker locker( &m_coreMutex );
|
|
|
|
m_core->revertDevice( selectedDevice() );
|
|
|
|
m_core->revertDevice( selectedDevice() );
|
|
|
|
} ),
|
|
|
|
} ),
|
|
|
@ -1033,7 +1037,8 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
|
|
|
|
Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox, m_core->bootLoaderInstallPath() );
|
|
|
|
Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox, m_core->bootLoaderInstallPath() );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} );
|
|
|
|
} );
|
|
|
|
connect( m_core,
|
|
|
|
connect(
|
|
|
|
|
|
|
|
m_core,
|
|
|
|
&PartitionCoreModule::deviceReverted,
|
|
|
|
&PartitionCoreModule::deviceReverted,
|
|
|
|
this,
|
|
|
|
this,
|
|
|
|
[this]( Device* dev ) {
|
|
|
|
[this]( Device* dev ) {
|
|
|
|