Fixed #249: log dialog covering error message
This commit is contained in:
parent
c1fd31dc24
commit
fb956d9141
@ -320,11 +320,11 @@ void LogQSO::accept()
|
|||||||
f.close();
|
f.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Q_EMIT acceptQSO (m_dateTimeOff, hisCall, hisGrid, m_dialFreq, mode, submode, rptSent, rptRcvd, comments, name,m_dateTimeOn, operator_call, m_myCall, m_myGrid, ADIF, additionalFields);
|
||||||
|
|
||||||
//Clean up and finish logging
|
//Clean up and finish logging
|
||||||
ui->call->clear();
|
ui->call->clear();
|
||||||
|
|
||||||
Q_EMIT acceptQSO (m_dateTimeOff, hisCall, hisGrid, m_dialFreq, mode, submode, rptSent, rptRcvd, comments, name,m_dateTimeOn, operator_call, m_myCall, m_myGrid, ADIF, additionalFields);
|
|
||||||
|
|
||||||
QDialog::accept();
|
QDialog::accept();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -7177,8 +7177,11 @@ void MainWindow::acceptQSO (QDateTime const& QSO_date_off, QString const& call,
|
|||||||
QUdpSocket _sock;
|
QUdpSocket _sock;
|
||||||
auto rzult = _sock.writeDatagram (ADIF + " <eor>", n1mmhost, quint16(m_config.n1mm_server_port()));
|
auto rzult = _sock.writeDatagram (ADIF + " <eor>", n1mmhost, quint16(m_config.n1mm_server_port()));
|
||||||
if (rzult == -1) {
|
if (rzult == -1) {
|
||||||
|
bool hidden = m_logDlg->isHidden();
|
||||||
|
m_logDlg->setHidden(true);
|
||||||
MessageBox::warning_message (this, tr ("Error sending log to N1MM"),
|
MessageBox::warning_message (this, tr ("Error sending log to N1MM"),
|
||||||
tr ("Write returned \"%1\"").arg (rzult));
|
tr ("Write returned \"%1\"").arg (rzult));
|
||||||
|
m_logDlg->setHidden(hidden);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -7246,8 +7249,11 @@ void MainWindow::acceptQSO (QDateTime const& QSO_date_off, QString const& call,
|
|||||||
m_n3fjpClient->sendNetworkMessage(host, port, "\r\n", true, 100);
|
m_n3fjpClient->sendNetworkMessage(host, port, "\r\n", true, 100);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
bool hidden = m_logDlg->isHidden();
|
||||||
|
m_logDlg->setHidden(true);
|
||||||
MessageBox::warning_message (this, tr ("Error sending log to N3FJP"),
|
MessageBox::warning_message (this, tr ("Error sending log to N3FJP"),
|
||||||
tr ("Write failed for \"%1:%2\"").arg (host).arg(port));
|
tr ("Write failed for \"%1:%2\"").arg (host).arg(port));
|
||||||
|
m_logDlg->setHidden(hidden);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user