noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash that would occur when performing certain actions after removing all tabs (#4271)

Browse source 
* Ensure we can deselect notebooks

* Add changelog entry

* Use dynamic_cast instead of raw cast
This commit is contained in:
pajlada 2022-12-29 19:15:32 +01:00 committed by GitHub
parent 11fdd7ed74
commit 90046f380f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -8,6 +8,7 @@
- Minor: Tables in settings window will now scroll to newly added rows. (#4216)
- Minor: Added link to streamlink docs for easier user setup. (#4217)
- Minor: Added setting to turn off rendering of reply context. (#4224)
- Bugfix: Fixed crash that would occur when performing certain actions after removing all tabs. (#4271)
- Bugfix: Fixed highlight sounds not reloading on change properly. (#4194)
- Bugfix: Fixed CTRL + C not working in reply thread popups. (#4209)
- Bugfix: Fixed message input showing as red after removing a message that was more than 500 characters. (#4204)

68
src/widgets/Notebook.cpp
View file

@ -156,49 +156,50 @@ int Notebook::indexOf(QWidget *page) const
void Notebook::select(QWidget *page, bool focusPage)
{
if (!page)
{
return;
}
if (page == this->selectedPage_)
{
// Nothing has changed
return;
}
auto *item = this->findItem(page);
if (!item)
if (page)
{
return;
}
page->show();
item->tab->setSelected(true);
item->tab->raise();
if (focusPage)
{
if (item->selectedWidget == nullptr)
// A new page has been selected, mark it as selected & focus one of its splits
auto *item = this->findItem(page);
if (!item)
{
item->page->setFocus();
return;
}
else
page->show();
item->tab->setSelected(true);
item->tab->raise();
if (focusPage)
{
if (containsChild(page, item->selectedWidget))
if (item->selectedWidget == nullptr)
{
item->selectedWidget->setFocus(Qt::MouseFocusReason);
item->page->setFocus();
}
else
{
qCDebug(chatterinoWidget) << "Notebook: selected child of "
"page doesn't exist anymore";
if (containsChild(page, item->selectedWidget))
{
item->selectedWidget->setFocus(Qt::MouseFocusReason);
}
else
{
qCDebug(chatterinoWidget) << "Notebook: selected child of "
"page doesn't exist anymore";
}
}
}
}
if (this->selectedPage_ != nullptr)
if (this->selectedPage_)
{
// Hide the previously selected page
this->selectedPage_->hide();
auto *item = this->findItem(selectedPage_);
@ -1169,22 +1170,29 @@ SplitContainer *SplitNotebook::getOrAddSelectedPage()
{
auto *selectedPage = this->getSelectedPage();
return selectedPage != nullptr ? (SplitContainer *)selectedPage
: this->addPage();
if (selectedPage)
{
return dynamic_cast<SplitContainer *>(selectedPage);
}
return this->addPage();
}
void SplitNotebook::select(QWidget *page, bool focusPage)
{
if (auto selectedPage = this->getSelectedPage())
// If there's a previously selected page, go through its splits and
// update their "last read message" indicator
if (auto *selectedPage = this->getSelectedPage())
{
if (auto splitContainer = dynamic_cast<SplitContainer *>(selectedPage))
if (auto *splitContainer = dynamic_cast<SplitContainer *>(selectedPage))
{
for (auto split : splitContainer->getSplits())
for (auto *split : splitContainer->getSplits())
{
split->updateLastReadMessage();
}
}
}
this->Notebook::select(page, focusPage);
}