mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-21 22:24:07 +01:00
fixed popup windows not having the right channel and the application
exiting when you close a popup
This commit is contained in:
parent
5015633cc7
commit
3c10c59ce6
2 changed files with 4 additions and 2 deletions
|
@ -314,7 +314,7 @@ void Split::doPopup()
|
||||||
Split *split =
|
Split *split =
|
||||||
new Split(static_cast<SplitContainer *>(window.getNotebook().getOrAddSelectedPage()));
|
new Split(static_cast<SplitContainer *>(window.getNotebook().getOrAddSelectedPage()));
|
||||||
|
|
||||||
split->setChannel(this->getChannel());
|
split->setChannel(this->getIndirectChannel());
|
||||||
window.getNotebook().getOrAddSelectedPage()->addToLayout(split);
|
window.getNotebook().getOrAddSelectedPage()->addToLayout(split);
|
||||||
|
|
||||||
window.show();
|
window.show();
|
||||||
|
|
|
@ -164,7 +164,9 @@ void Window::closeEvent(QCloseEvent *event)
|
||||||
|
|
||||||
this->closed.invoke();
|
this->closed.invoke();
|
||||||
|
|
||||||
QApplication::exit();
|
if (this->type == Window::Main) {
|
||||||
|
QApplication::exit();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace widgets
|
} // namespace widgets
|
||||||
|
|
Loading…
Reference in a new issue