From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 1 Feb 2008 11:51:52 +0000 (+0000)
Subject: Shutdown notifier before closing socket
X-Git-Tag: Release-3.0.0~1929
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=acf53216df0d9d024ce45b068ee25ad43a1a6a38;p=bacula%2Fbacula

Shutdown notifier before closing socket

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6354 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp
index fd4273b3b6..a84de24645 100644
--- a/bacula/src/qt-console/console/console.cpp
+++ b/bacula/src/qt-console/console/console.cpp
@@ -103,6 +103,9 @@ void Console::poll_messages()
 void Console::terminate()
 {
    if (m_sock) {
+      notify(false);
+      delete m_notifier;
+      m_notifier = NULL;
       stopTimer();
       m_sock->close();
       m_sock = NULL;
diff --git a/bacula/src/qt-console/main.cpp b/bacula/src/qt-console/main.cpp
index 8aa2b39f39..139a33778b 100644
--- a/bacula/src/qt-console/main.cpp
+++ b/bacula/src/qt-console/main.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2008 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -142,9 +142,8 @@ int main(int argc, char *argv[])
    return app->exec();
 }
 
-void terminate_console(int sig)
+void terminate_console(int /*sig*/)
 {
-   (void)sig;                         /* avoid compiler complaints */
    exit(0);
 }
 
diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index 92cc016051..e3c43ed662 100644
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2008 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.