From 323ffcd26922c66647827aa35a3763ef697058c4 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 22 May 2007 20:43:33 +0000 Subject: [PATCH] Fix timer looping on disconnect git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4880 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/qt-console/console/console.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp index 774874d027..26a7b21010 100644 --- a/bacula/src/qt-console/console/console.cpp +++ b/bacula/src/qt-console/console/console.cpp @@ -96,9 +96,9 @@ void Console::poll_messages() void Console::terminate() { if (m_sock) { + stopTimer(); m_sock->close(); m_sock = NULL; - stopTimer(); } } @@ -688,9 +688,9 @@ int Console::read() } if (is_bnet_stop(m_sock)) { /* error or term request */ if (mainWin->m_commDebug) Pmsg0(000, "BNET STOP\n"); + stopTimer(); m_sock->close(); m_sock = NULL; - stopTimer(); mainWin->actionConnect->setIcon(QIcon(":images/disconnected.png")); QBrush redBrush(Qt::red); QTreeWidgetItem *item = mainWin->getFromHash(this); @@ -803,6 +803,8 @@ bool Console::preventInUseConnect() */ static int tls_pem_callback(char *buf, int size, const void *userdata) { + (void)size; + (void)userdata; #ifdef HAVE_TLS const char *prompt = (const char *)userdata; # if defined(HAVE_WIN32) -- 2.39.5