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

[libcalamares] Don't crash when creating System object

Browse Source 
- In tests, a System object might be created without first
   setting up a JobQueue. In that case, there's no instance,
   so no GS to insert into. Avoid crash here.
This commit is contained in:
Adriaan de Groot 2019-07-05 23:20:19 +02:00
parent 39d618c61e
commit 76ce0e4f2b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcalamares/utils/CalamaresUtilsSystem.cpp
View File

@ -85,8 +85,10 @@ System::System( bool doChroot, QObject* parent )
{ {
Q_ASSERT( !s_instance ); Q_ASSERT( !s_instance );
s_instance = this; s_instance = this;
if ( !doChroot ) if ( !doChroot && Calamares::JobQueue::instance() && Calamares::JobQueue::instance()->globalStorage() )
{
Calamares::JobQueue::instance()->globalStorage()->insert( "rootMountPoint", "/" ); Calamares::JobQueue::instance()->globalStorage()->insert( "rootMountPoint", "/" );
}
} }