From: Janne Koschinski Date: Tue, 15 Jan 2019 16:32:08 +0000 (+0100) Subject: Fixes bug where nicklist was broken on first start X-Git-Tag: test-travis-01~77 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=4a5f59de4b332d16ff8942051e29d9354b5bbac3 Fixes bug where nicklist was broken on first start Starting with commit 66e6d26 the nicklist gets hidden in setDisconnectedState, but only unhidden in loadLayout. As loadLayout skips the setVisible(true) if the state is empty, the actual widget gets never shown, and the nicklist dock remains empty. This was fixed by moving the setVisible call above the conditional return. --- diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index bd79ea58..b5de36ab 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -1274,13 +1274,13 @@ void MainWin::loadLayout() QtUiSettings s; int accountId = Client::currentCoreAccount().accountId().toInt(); QByteArray state = s.value(QString("MainWinState-%1").arg(accountId)).toByteArray(); + _nickListWidget->setVisible(true); if (state.isEmpty()) { foreach (BufferViewDock* view, _bufferViews) view->show(); _layoutLoaded = true; return; } - _nickListWidget->setVisible(true); restoreState(state, accountId); int bufferViewId = s.value(QString("ActiveBufferView-%1").arg(accountId), -1).toInt(); if (bufferViewId >= 0)