fixed popup windows not having the right channel and the application
exiting when you close a popup
This commit is contained in:
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user