Commit 7ef617b7 authored by Edric Milaret's avatar Edric Milaret Committed by Alexandre Lision

im: fix for not disconnected signal when im view not active

This was setting message sent by the last call you made to seen

Change-Id: Ib05aad9348032a41892ee3370bce53c7a031bc63
Tuleap: #315
parent 9949b346
...@@ -518,6 +518,8 @@ CallWidget::smartListSelectionChanged(const QItemSelection& newSel, const QItemS ...@@ -518,6 +518,8 @@ CallWidget::smartListSelectionChanged(const QItemSelection& newSel, const QItemS
} else { } else {
setActualCall(nullptr); setActualCall(nullptr);
ui->instantMessagingWidget->hide(); ui->instantMessagingWidget->hide();
if (imConnection_)
disconnect(imConnection_);
ui->stackedWidget->setCurrentWidget(ui->welcomePage); ui->stackedWidget->setCurrentWidget(ui->welcomePage);
} }
} }
...@@ -624,7 +626,8 @@ CallWidget::on_contactMethodComboBox_currentIndexChanged(const QString& number) ...@@ -624,7 +626,8 @@ CallWidget::on_contactMethodComboBox_currentIndexChanged(const QString& number)
auto cm = PhoneDirectoryModel::instance().getNumber(number); auto cm = PhoneDirectoryModel::instance().getNumber(number);
if (auto txtRecording = cm->textRecording()) { if (auto txtRecording = cm->textRecording()) {
ui->listMessageView->setModel(txtRecording->instantMessagingModel()); ui->listMessageView->setModel(txtRecording->instantMessagingModel());
disconnect(imConnection_); if (imConnection_)
disconnect(imConnection_);
imConnection_ = connect(txtRecording, imConnection_ = connect(txtRecording,
SIGNAL(messageInserted(QMap<QString,QString>,ContactMethod*,Media::Media::Direction)), SIGNAL(messageInserted(QMap<QString,QString>,ContactMethod*,Media::Media::Direction)),
this, this,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment