|
|
|
@ -306,11 +306,28 @@ ChoicePage::applyDeviceChoice()
|
|
|
|
|
|
|
|
|
|
|
|
if ( m_core->isDirty() )
|
|
|
|
if ( m_core->isDirty() )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
ScanningDialog::run( QtConcurrent::run( [ = ]
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
QMutexLocker locker( &m_coreMutex );
|
|
|
|
m_core->revertAllDevices();
|
|
|
|
m_core->revertAllDevices();
|
|
|
|
|
|
|
|
} ),
|
|
|
|
|
|
|
|
[ this ]
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
continueApplyDeviceChoice();
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
this );
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
continueApplyDeviceChoice();
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Device* currd = selectedDevice();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
|
|
|
ChoicePage::continueApplyDeviceChoice()
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
Device* currd = selectedDevice();
|
|
|
|
|
|
|
|
|
|
|
|
// The device should only be nullptr immediately after a PCM reset.
|
|
|
|
// The device should only be nullptr immediately after a PCM reset.
|
|
|
|
// applyDeviceChoice() will be called again momentarily as soon as we handle the
|
|
|
|
// applyDeviceChoice() will be called again momentarily as soon as we handle the
|
|
|
|
|