From ca4de2bf38724cc1bcdb6a333014cad34f6430b4 Mon Sep 17 00:00:00 2001 From: M4x1m3 Date: Tue, 10 Dec 2019 22:03:01 +0100 Subject: [PATCH 1/2] [apps/settings] Exam mode settings not editable while in exam mode. --- apps/settings/sub_menu/exam_mode_controller.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/settings/sub_menu/exam_mode_controller.cpp b/apps/settings/sub_menu/exam_mode_controller.cpp index b293081e0..61421af71 100644 --- a/apps/settings/sub_menu/exam_mode_controller.cpp +++ b/apps/settings/sub_menu/exam_mode_controller.cpp @@ -27,10 +27,10 @@ void ExamModeController::didEnterResponderChain(Responder * previousFirstRespond bool ExamModeController::handleEvent(Ion::Events::Event event) { I18n::Message childLabel = m_messageTreeModel->children(selectedRow())->label(); if (event == Ion::Events::OK || event == Ion::Events::EXE || event == Ion::Events::Right) { + if (GlobalPreferences::sharedGlobalPreferences()->examMode() == GlobalPreferences::ExamMode::Activate) { + return true; + } if (childLabel == I18n::Message::ActivateExamMode || childLabel == I18n::Message::ExamModeActive) { - if (GlobalPreferences::sharedGlobalPreferences()->examMode() == GlobalPreferences::ExamMode::Activate) { - return false; - } AppsContainer::sharedAppsContainer()->displayExamModePopUp(true); return true; } From 5ae425f1049a2b91b453ce2c95d27023f5f5ada2 Mon Sep 17 00:00:00 2001 From: M4x1m3 Date: Sat, 14 Dec 2019 15:51:12 +0100 Subject: [PATCH 2/2] [apps/settings] Fixed compilation error Co-Authored-By: Quentin --- apps/settings/sub_menu/exam_mode_controller.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/settings/sub_menu/exam_mode_controller.cpp b/apps/settings/sub_menu/exam_mode_controller.cpp index 61421af71..24d6f93c3 100644 --- a/apps/settings/sub_menu/exam_mode_controller.cpp +++ b/apps/settings/sub_menu/exam_mode_controller.cpp @@ -27,7 +27,7 @@ void ExamModeController::didEnterResponderChain(Responder * previousFirstRespond bool ExamModeController::handleEvent(Ion::Events::Event event) { I18n::Message childLabel = m_messageTreeModel->children(selectedRow())->label(); if (event == Ion::Events::OK || event == Ion::Events::EXE || event == Ion::Events::Right) { - if (GlobalPreferences::sharedGlobalPreferences()->examMode() == GlobalPreferences::ExamMode::Activate) { + if (GlobalPreferences::sharedGlobalPreferences()->examMode()) { return true; } if (childLabel == I18n::Message::ActivateExamMode || childLabel == I18n::Message::ExamModeActive) {