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 fd4273b3b67003b13d30be28acd559b09b538b72..a84de24645e19aab303cb68b26524dae2a751dd2 100644 (file)
--- 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 8aa2b39f3905007b136dd42f623a101f2fdad39b..139a33778bce139034dadc145dd5ed9cdcb3e180 100644 (file)
--- 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 92cc016051a4b85519d778d42d199a6372caa195..e3c43ed6623a89c8ede793e96fa7e7b222b963ac 100644 (file)
--- 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.