Skip to content

Commit 56192ae

Browse files
committed
Handle removal of widget same as textmessagedlg
1 parent 353453b commit 56192ae

File tree

1 file changed

+18
-5
lines changed

1 file changed

+18
-5
lines changed

Client/qtTeamTalk/mainwindow.cpp

+18-5
Original file line numberDiff line numberDiff line change
@@ -2769,18 +2769,31 @@ void MainWindow::setupChatHistory()
27692769
if (listview)
27702770
{
27712771
auto chat = new ChatTextList(ui.chatTab);
2772-
delete ui.chatTab->layout()->replaceWidget(ui.chatEdit, chat);
2772+
auto layout = ui.chatTab->layout();
2773+
auto index = layout->indexOf(ui.chatEdit);
2774+
layout->removeWidget(ui.chatEdit);
2775+
layout->addWidget(chat);
27732776
m_chathistory[TAB_CHAT] = chat;
2777+
delete ui.chatEdit;
2778+
ui.chatEdit = nullptr;
27742779

27752780
auto video = new ChatTextList(ui.videoTab);
2776-
delete ui.videoTab->layout()->replaceWidget(ui.videochatEdit, video);
2781+
layout = ui.videoTab->layout();
2782+
index = layout->indexOf(ui.videochatEdit);
2783+
layout->removeWidget(ui.videochatEdit);
2784+
layout->addWidget(video);
27772785
m_chathistory[TAB_VIDEO] = video;
2786+
delete ui.videochatEdit;
2787+
ui.videochatEdit = nullptr;
27782788

27792789
auto desktop = new ChatTextList(ui.desktopTab);
2780-
delete ui.desktopTab->layout()->replaceWidget(ui.desktopchatEdit, desktop);
2790+
layout = ui.desktopTab->layout();
2791+
index = layout->indexOf(ui.desktopchatEdit);
2792+
layout->removeWidget(ui.desktopchatEdit);
2793+
layout->addWidget(desktop);
27812794
m_chathistory[TAB_DESKTOP] = desktop;
2782-
2783-
ui.chatEdit = ui.videochatEdit = ui.desktopchatEdit = nullptr;
2795+
delete ui.desktopchatEdit;
2796+
ui.desktopchatEdit = nullptr;
27842797
}
27852798
else
27862799
{

0 commit comments

Comments
 (0)