This is a first commit at attempting to prevent connecting to a director which

has a closed connection.

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

diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp
index 0637e84435b624a15e68225bad30f384b0ba2f23..474c626a4c532135a9b15a18d7c206e60643ac9e 100644 (file)
--- a/bacula/src/qt-console/console/console.cpp
+++ b/bacula/src/qt-console/console/console.cpp
@@ -201,6 +201,8 @@ bool Console::sql_cmd(QString &query, QStringList &results)
  */
 bool Console::sql_cmd(const char *query, QStringList &results)
 {
+   if (!is_connectedGui())
+      return false;
    int stat;
    POOL_MEM cmd(PM_MESSAGE);
 
@@ -640,3 +642,17 @@ void Console::getDirResName(QString &name_returned)
 {
    name_returned = m_dir->name();
 }
+
+bool Console::is_connectedGui()
+{
+   if (is_connected()) {
+      return true;
+   } else {
+      QString message("Director ");
+      message += m_dir->name();
+      message += " is curerntly disconnected\n  Please reconnect!!";
+      QMessageBox::warning(this, tr("Bat"),
+         tr(message.toUtf8().data()), QMessageBox::Ok );
+      return false;
+   }
+}

diff --git a/bacula/src/qt-console/console/console.h b/bacula/src/qt-console/console/console.h
index 6a38782dfe9b4aa5a42c5bab26a8342d6f7f0a17..98668318124cf1976c60ba9921a16bffc17a9977 100644 (file)
--- a/bacula/src/qt-console/console/console.h
+++ b/bacula/src/qt-console/console/console.h
@@ -83,6 +83,7 @@ public:
    bool sql_cmd(QString &cmd, QStringList &results);
    bool authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons);
    bool is_connected() { return m_sock != NULL; };
+   bool is_connectedGui();
    const QFont get_font();
    void writeSettings();
    void readSettings();

diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index 0f94ba6e7998a9bd5d4d4b025db4109fcea4586d..feab8359f246d7e299826a1a93e988bc45befa5f 100644 (file)
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -344,7 +344,7 @@ void MainWin::treeItemChanged(QTreeWidgetItem *currentitem, QTreeWidgetItem *pre
       /* let the next page BE the console */
       nextPage = nextConsole;
    } else {
-      printf("Should never get here\n");
+      /* Should never get here */
       nextPage = NULL;
       nextConsole = NULL;
    }
@@ -383,7 +383,7 @@ void MainWin::treeItemChanged(QTreeWidgetItem *currentitem, QTreeWidgetItem *pre
       }
    }
 
-   /* now process the next item */
+   /* process the current (next) item */
    
    if ((nextPage) || (nextConsole)) {
       if (nextConsole != previousConsole) {

diff --git a/bacula/src/qt-console/pages.cpp b/bacula/src/qt-console/pages.cpp
index 1ef945f8923601b34e416230d37c83df495db724..801200f6116f0c39f43de3234dd918f8a6ec0130 100644 (file)
--- a/bacula/src/qt-console/pages.cpp
+++ b/bacula/src/qt-console/pages.cpp
@@ -213,6 +213,8 @@ void Pages::treeWidgetName(QString &name)
  */
 void Pages::consoleCommand(QString &command)
 {
+   if (!m_console->is_connectedGui())
+       return;
    m_console->display_text("Context sensitive command :\n\n");
    m_console->display_text("****    ");
    m_console->display_text(command + "    ****\n");