more stable partial fix for issue #6

arterialist · May 26, 2018 · 5af8dfd · 5af8dfd
1 parent 8c6abc5
commit 5af8dfd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/callback/callbacks.py b/callback/callbacks.py
@@ -109,22 +109,13 @@ def new_message_callback(packet, window):
 
 
 def invalid_message_callback(reason, message):
+    client_base.invalid_message_callback = None
     alert_box = QMessageBox()
     alert_box.setWindowTitle("Invalid message received")
-    alert_box.setText("Reason:\n{}".format(reason))
-    alert_box.addButton("View", QMessageBox.ActionRole)
+    alert_box.setText("Reason:\n{}\n\nMessage:\n{}".format(reason, message))
     alert_box.setStandardButtons(QMessageBox.Ok)
-    alert_box.buttonClicked.connect(lambda btn: view_button_clicked_callback(btn, message))
     alert_box.exec_()
-
-
-def view_button_clicked_callback(button, message):
-    if button.text() == "View":
-        alert_box = QMessageBox()
-        alert_box.setWindowTitle("Message")
-        alert_box.setText(message)
-        alert_box.addButton("Ok", QMessageBox.YesRole)
-        alert_box.exec_()
+    client_base.invalid_message_callback = invalid_message_callback
 
 
 def delete_dialog_callback(peer_id):

diff --git a/main.py b/main.py
@@ -84,7 +84,7 @@ def init_ui(self):
 
         client_base.init_socket()
         client_base.new_message_callback = lambda message: new_message_callback(message, window)
-        client_base.invalid_message_callback = lambda reason, message: invalid_message_callback(reason, message)
+        client_base.invalid_message_callback = invalid_message_callback
 
     def closeEvent(self, a0: QCloseEvent):
         client_base.finish()