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

Update Settings.cpp

Browse Source
This commit is contained in:
The feren OS Dev 2019-04-16 17:11:39 +01:00 committed by GitHub
parent 08249af716
commit 02d6e1a946
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libcalamares/Settings.cpp
View File

@ -185,6 +185,7 @@ Settings::Settings( const QString& settingsFilePath,
, m_doChroot( true ) , m_doChroot( true )
, m_promptInstall( false ) , m_promptInstall( false )
, m_disableCancel( false ) , m_disableCancel( false )
, m_dontCancel( false )
{ {
cDebug() << "Using Calamares settings file at" << settingsFilePath; cDebug() << "Using Calamares settings file at" << settingsFilePath;
QFile file( settingsFilePath ); QFile file( settingsFilePath );
@ -206,6 +207,7 @@ Settings::Settings( const QString& settingsFilePath,
m_doChroot = !requireBool( config, "dont-chroot", false ); m_doChroot = !requireBool( config, "dont-chroot", false );
m_isSetupMode = requireBool( config, "oem-setup", !m_doChroot ); m_isSetupMode = requireBool( config, "oem-setup", !m_doChroot );
m_disableCancel = requireBool( config, "disable-cancel", false ); m_disableCancel = requireBool( config, "disable-cancel", false );
m_dontCancel = requireBool( config, "dont-cancel", false );
} }
catch ( YAML::Exception& e ) catch ( YAML::Exception& e )
{ {
@ -273,6 +275,12 @@ Settings::disableCancel() const
{ {
return m_disableCancel; return m_disableCancel;
} }
bool
Settings::dontCancel() const
{
return m_dontCancel;
}
} }