From db18a550b647553034e4b9d83d1150db65e3e29f Mon Sep 17 00:00:00 2001 From: pgScorpio Date: Sat, 26 Mar 2022 20:27:58 +0100 Subject: [PATCH] Connection status issue jamulussoftware#2519 second stage Moved Connect/Disconnect code from CClientdlg to CClient. Now using the proper connected checks in several places. Added bDisconnectAndDisable to CChannel. (For a Client now Channel.Disconnect() will block audio data and auto disable the channel on disconnected) --- src/clientdlg.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp index 82dbb1888a..a3c9814a01 100644 --- a/src/clientdlg.cpp +++ b/src/clientdlg.cpp @@ -1183,6 +1183,7 @@ void CClientDlg::OnConnect ( QString strServerName ) // audio feedback detection if ( pSettings->bEnableFeedbackDetection ) { +<<<<<<< HEAD // try to start client, if error occurred, do not go in // running state but show error message try @@ -1223,6 +1224,10 @@ void CClientDlg::OnConnect ( QString strServerName ) TimerDetectFeedback.start ( DETECT_FEEDBACK_TIME_MS ); // single shot timer bDetectFeedback = true; } +======= + TimerDetectFeedback.start ( DETECT_FEEDBACK_TIME_MS ); // single shot timer + bDetectFeedback = true; +>>>>>>> f50b4535 (Connection status issue jamulussoftware#2519 second stage) } }