Application 3.0.1, MainForm 4.1.1: исправление возможной ошибки, связ…

…анной с непоявлением уведомления об отклонении соединения и последующей "невключением" полей об удалённом пользователе.
M61Shaforostov · Jan 7, 2016 · 1474419 · 1474419 · M61Shaforostov · Jan 7, 2016
1 parent ade3e93
commit 1474419
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Application.java b/src/Application.java
@@ -310,14 +310,13 @@ public void acceptIncomingCall() {
   public void rejectIncomingCall() {
     try {
       incomingConnection.reject();
-      closeConnection();
     } catch (IOException e) {
       e.printStackTrace();
     }
   }
 
   public void finishCall() {
-    if ((outcomingConnection != null) && (outcomingConnection.isConnected()))
+    if (outcomingConnection.isConnected())
       try {
 	outcomingConnection.disconnect();
       } catch (IOException e) {

diff --git a/src/MainForm.java b/src/MainForm.java
@@ -128,6 +128,9 @@ public void actionPerformed(ActionEvent e) {
       public void actionPerformed(ActionEvent e) {
 	blockDialogComponents(true);
 	logicModel.finishCall();
+	try {
+	  Thread.sleep(100);
+	} catch (InterruptedException ex) {}
 	logicModel.closeConnection();
 	blockRemoteUserInfo(false);
       }
@@ -253,6 +256,10 @@ public void showIncomingCallDialog(String nick, String IP) {
       blockDialogComponents(false);
     } else {
       logicModel.rejectIncomingCall();
+      try {
+	Thread.sleep(100);
+      } catch (InterruptedException ex) {}
+      logicModel.closeConnection();
     }
   }