From 181a17bbdcd407083769ae68fcb2eb8c76182df4 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 6 Sep 2016 16:57:50 +0200 Subject: [PATCH] Output pane: Fix that height setting could reset When opening Qt Creator, and closing it without showing an output pane, it would write a height of 0 into the settings. Task-number: QTCREATORBUG-16829 Change-Id: Ia8ab0cea6620c4e654060f92f51bd5f0ce10e6b9 Reviewed-by: Tobias Hunger --- src/plugins/coreplugin/outputpane.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp index b0f5c195bce..6ac11d9780c 100644 --- a/src/plugins/coreplugin/outputpane.cpp +++ b/src/plugins/coreplugin/outputpane.cpp @@ -183,6 +183,8 @@ void OutputPanePlaceHolder::ensureSizeHintAsMinimum() int OutputPanePlaceHolder::nonMaximizedSize() const { + if (!d->m_initialized) + return Internal::OutputPaneManager::outputPaneHeightSetting(); return d->m_nonMaximizedSize; }