feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix crash with ADS

Browse Source 
When pressing Ctrl + Shift + F in design mode the OutputPanePlaceHolder
is requesting its splitter, which isn't set with ADS. To avoid nullptr
access a check for the splitter before accessing.

Change-Id: I3085bba23d4cf9bddcfec154e4557000d880600d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Henning Gruendl
2020-07-07 14:18:09 +02:00
committed by Henning Gründl
parent 284ff753f3
commit 044faadc2d
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/outputpane.cpp
View File

@@ -176,6 +176,8 @@ void OutputPanePlaceHolder::setHeight(int height)
void OutputPanePlaceHolder::ensureSizeHintAsMinimum() void OutputPanePlaceHolder::ensureSizeHintAsMinimum()
{ {
if (!d->m_splitter)
return;
Internal::OutputPaneManager *om = Internal::OutputPaneManager::instance(); Internal::OutputPaneManager *om = Internal::OutputPaneManager::instance();
int minimum = (d->m_splitter->orientation() == Qt::Vertical int minimum = (d->m_splitter->orientation() == Qt::Vertical
? om->sizeHint().height() : om->sizeHint().width()); ? om->sizeHint().height() : om->sizeHint().width());