Conflict fixed: mainwindow.cpp and httpclient.cpp

[speedfreak] / Client / resultdialog.cpp

diff --git a/Client/resultdialog.cpp b/Client/resultdialog.cpp
index 0662fe2..88171ab 100644 (file)
--- a/Client/resultdialog.cpp
+++ b/Client/resultdialog.cpp
@@ -324,7 +324,7 @@ void ResultDialog::on_pushButtonNew_clicked()
   */
 void ResultDialog::on_pushButtonSend_clicked()
 {
-    //emit sendresult();
+    ui->pushButtonSend->setEnabled(false);
     emit sendresult(timeArray[this->getTargetChoice()]);
 }
 
@@ -759,3 +759,11 @@ void ResultDialog::setLabelInfoToUser(QString infoText)
 {
     this->ui->labelInfoToUser->setText(infoText);
 }
+
+/**
+  * This function enable send server button.
+  */
+void ResultDialog::setSendServerButtonEnabled()
+{
+    ui->pushButtonSend->setEnabled(true);
+}