mirror of
https://github.com/parchlinux/calamares.git
synced 2025-07-02 20:05:37 -04:00
Rearrange asynchronous scan in PartitionCoreModule a bit.
This commit is contained in:
parent
92eb947cc5
commit
45f6e6c55b
3 changed files with 17 additions and 6 deletions
|
@ -58,8 +58,8 @@
|
|||
|
||||
PartitionViewStep::PartitionViewStep( QObject* parent )
|
||||
: Calamares::ViewStep( parent )
|
||||
, m_widget( new QStackedWidget() )
|
||||
, m_core( nullptr )
|
||||
, m_widget( new QStackedWidget() )
|
||||
, m_choicePage( nullptr )
|
||||
, m_manualPartitionPage( nullptr )
|
||||
{
|
||||
|
@ -69,6 +69,7 @@ PartitionViewStep::PartitionViewStep( QObject* parent )
|
|||
m_widget->addWidget( m_waitingWidget );
|
||||
CALAMARES_RETRANSLATE( qobject_cast< WaitingWidget* >( m_waitingWidget )->setText( tr( "Gathering system information..." ) ); )
|
||||
|
||||
m_core = new PartitionCoreModule( this ); // Unusable before init is complete!
|
||||
// We're not done loading, but we need the configuration map first.
|
||||
}
|
||||
|
||||
|
@ -76,8 +77,8 @@ PartitionViewStep::PartitionViewStep( QObject* parent )
|
|||
void
|
||||
PartitionViewStep::initPartitionCoreModule()
|
||||
{
|
||||
Q_ASSERT( !m_core );
|
||||
m_core = new PartitionCoreModule( this );
|
||||
Q_ASSERT( m_core );
|
||||
m_core->init();
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue