From d506296aa75c9b11e3176aa8f307a0e2cccdf5cb Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 21 Apr 2019 17:15:53 +0200 Subject: [PATCH] [libcalamares] Adjust code to changed name - renamed setting in the configuration file, but not in the code - add documentation to getters --- src/libcalamares/Settings.cpp | 2 +- src/libcalamares/Settings.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libcalamares/Settings.cpp b/src/libcalamares/Settings.cpp index 4b33fa2e7..74b99c417 100644 --- a/src/libcalamares/Settings.cpp +++ b/src/libcalamares/Settings.cpp @@ -207,7 +207,7 @@ Settings::Settings( const QString& settingsFilePath, m_doChroot = !requireBool( config, "dont-chroot", false ); m_isSetupMode = requireBool( config, "oem-setup", !m_doChroot ); m_disableCancel = requireBool( config, "disable-cancel", false ); - m_dontCancel = requireBool( config, "dont-cancel", false ); + m_dontCancel = requireBool( config, "disable-cancel-during-exec", false ); } catch ( YAML::Exception& e ) { diff --git a/src/libcalamares/Settings.h b/src/libcalamares/Settings.h index 75c7886c9..da3f46921 100644 --- a/src/libcalamares/Settings.h +++ b/src/libcalamares/Settings.h @@ -69,8 +69,9 @@ public: */ bool isSetupMode() const { return m_isSetupMode; } + /** @brief Global setting of disable-cancel: can't cancel ever. */ bool disableCancel() const; - + /** @brief Temporary setting of disable-cancel: can't cancel during exec. */ bool dontCancel() const; private: