From 58cd47f2030260c13749692d33fe1d53f90eb5c3 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 14 Mar 2023 17:32:59 +0100 Subject: [PATCH] QmlDesigner: Fix crash when accessing optional Task-number: QDS-9439 Change-Id: Ic80ea2558f6b41da127000441a75773d382f5a05 (cherry picked from commit 925b08d6e6e47d41ae56f1d63a722ed99e0b0b34) Reviewed-by: Tim Jenssen --- .../qmldesigner/components/toolbar/toolbarbackend.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp b/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp index e77bd51d3b9..883ae50acc6 100644 --- a/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp +++ b/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp @@ -368,8 +368,11 @@ void ToolBarBackend::updateDocumentModel() int ToolBarBackend::documentIndex() const { - if (Core::EditorManager::currentDocument()) - return Core::DocumentModel::indexOfDocument(Core::EditorManager::currentDocument()).value(); + if (Core::EditorManager::currentDocument()) { + std::optional index = Core::DocumentModel::indexOfDocument( + Core::EditorManager::currentDocument()); + return index.value_or(-1); + } return -1; }