diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2023-03-14 17:32:59 +0100 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2023-03-15 15:40:48 +0000 |
| commit | 58cd47f2030260c13749692d33fe1d53f90eb5c3 (patch) | |
| tree | 64bb3968243a52cc33814e87d956b4071e1ca1bd | |
| parent | 150bc2df5057acf890f6beb79e14b2955d5b23cb (diff) | |
| download | qt-creator-58cd47f2030260c13749692d33fe1d53f90eb5c3.tar.gz | |
QmlDesigner: Fix crash when accessing optional
Task-number: QDS-9439
Change-Id: Ic80ea2558f6b41da127000441a75773d382f5a05
(cherry picked from commit 925b08d6e6e47d41ae56f1d63a722ed99e0b0b34)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| -rw-r--r-- | src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp b/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp index e77bd51d3b..883ae50acc 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; } |