Fix bat

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@6836 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..77106b2bb86c87b893a3513caeeca0e3b103eb2c 100644 (file)
--- a/bacula/src/qt-console/console/console.cpp
+++ b/bacula/src/qt-console/console/console.cpp
@@ -103,6 +103,11 @@ void Console::poll_messages()
 void Console::terminate()
 {
    if (m_sock) {
+      if (m_notifier) {
+         m_notifier->setEnabled(false);
+         delete m_notifier;
+         m_notifier = NULL;
+      }
       stopTimer();
       m_sock->close();
       m_sock = NULL;

diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index 079c2a2f7a6baa6e401832048330013a74a7bdd9..4bda5d76743a788dc406a9fa9c24b248eed2cb2a 100644 (file)
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -247,16 +247,6 @@ void MainWin::closeEvent(QCloseEvent *event)
 {
    m_isClosing = true;
    writeSettings();
-   /*
-    * Close the console pages before non-console pages so that
-    *  the notifier is turned off. Otherwise it prints an error when
-    *  the page it is using gets destroyed.
-    */
-   foreach(Console *console, m_consoleHash){
-      console->writeSettings();
-      console->terminate();
-      console->closeStackPage();
-   }
    /* close all non console pages, this will call settings in destructors */
    while (m_consoleHash.count() < m_pagehash.count()) {
       foreach(Pages *page, m_pagehash) {
@@ -269,6 +259,16 @@ void MainWin::closeEvent(QCloseEvent *event)
          }
       }
    }
+   /*
+    * Close the console pages before non-console pages so that
+    *  the notifier is turned off. Otherwise it prints an error when
+    *  the page it is using gets destroyed.
+    */
+   foreach(Console *console, m_consoleHash){
+      console->writeSettings();
+      console->terminate();
+      console->closeStackPage();
+   }
    event->accept();
 }
 

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index bdba766de4fef550709059a4b914649a42424070..2fed7b28854fe05bcf8cdc8d3da01089543aaaa6 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,10 @@
               Technical notes on version 2.2
 
 General:
+17Apr08
+kes  Fix seg fault terminating bat.
+
+Beta Release Version 2.2.10-b1
 16Apr08
 kes  Permit multiple simultaneous restores -- experiment.
 15Apr08