From 088fa5004cc5219f9c0b98d28bc474021ab77cff Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 14 May 2019 13:21:05 +0200 Subject: [PATCH] [libcalamaresui] Disallow closing the window during execution - If the disable-cancel-during-exec setting is on, and the user clicks the window-close button, then disregard the close message. --- src/libcalamaresui/ViewManager.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 3777ff9c1..817ee346f 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -373,6 +373,8 @@ bool ViewManager::confirmCancelInstallation() if ( settings->disableCancel() ) return false; + if ( settings->dontCancel() && stepIsExecute( m_steps, m_currentStep ) ) + return false; // If it's NOT the last page of the last step, we ask for confirmation if ( !( m_currentStep == m_steps.count() -1 &&