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 "Change channel" popup title (#3273)

Browse source 
Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
This commit is contained in:
Mikulex 2021-10-23 13:22:54 +02:00 committed by GitHub
parent e033f8e43e
commit 3f12d5bb3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -33,6 +33,7 @@
- Bugfix: Fixed some channels still not loading in rare cases. (#3219) - Bugfix: Fixed some channels still not loading in rare cases. (#3219)
- Bugfix: Fixed a bug with usernames or emotes completing from the wrong position. (#3229) - Bugfix: Fixed a bug with usernames or emotes completing from the wrong position. (#3229)
- Bugfix: Fixed second chatterino icon appearing in the dock when restarting on a crash in macOS. (#3268) - Bugfix: Fixed second chatterino icon appearing in the dock when restarting on a crash in macOS. (#3268)
- Bugfix: Fixed the "Change channel" popup showing a wrong window title (#3273)
- Bugfix: Fixed built-in Chatterino commands not working in whispers and mentions special channels (#3288) - Bugfix: Fixed built-in Chatterino commands not working in whispers and mentions special channels (#3288)
- Bugfix: Fixed `QCharRef with an index pointing outside the valid range of a QString` warning that was emitted on every Tab press. (#3234) - Bugfix: Fixed `QCharRef with an index pointing outside the valid range of a QString` warning that was emitted on every Tab press. (#3234)
- Bugfix: Fixed being unable to disable `First Message` highlights (#3293) - Bugfix: Fixed being unable to disable `First Message` highlights (#3293)

1
src/widgets/splits/Split.cpp
View file

@ -466,6 +466,7 @@ void Split::showChangeChannelPopup(const char *dialogTitle, bool empty,
dialog->setSelectedChannel(this->getIndirectChannel()); dialog->setSelectedChannel(this->getIndirectChannel());
} }
dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->setAttribute(Qt::WA_DeleteOnClose);
dialog->setWindowTitle(dialogTitle);
dialog->show(); dialog->show();
dialog->closed.connect([=] { dialog->closed.connect([=] {
if (dialog->hasSeletedChannel()) if (dialog->hasSeletedChannel())

2
src/widgets/splits/SplitContainer.cpp
View file

@ -123,7 +123,7 @@ Split *SplitContainer::appendNewSplit(bool openChannelNameDialog)
if (openChannelNameDialog) if (openChannelNameDialog)
{ {
split->showChangeChannelPopup("Open channel name", true, [=](bool ok) { split->showChangeChannelPopup("Open channel", true, [=](bool ok) {
if (!ok) if (!ok)
{ {
this->deleteSplit(split); this->deleteSplit(split);