There was an issue with empty directories. The director would print

[bacula/bacula] / bacula / src / qt-console / pages.cpp

diff --git a/bacula/src/qt-console/pages.cpp b/bacula/src/qt-console/pages.cpp
index f938eabbb3aad3ea16f2f63278139b990508a28a..2767a584ee40a06d9a4710a4a473c6027dca6680 100644 (file)
--- a/bacula/src/qt-console/pages.cpp
+++ b/bacula/src/qt-console/pages.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2009 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.
@@ -230,25 +230,29 @@ void Pages::treeWidgetName(QString &name)
  */
 void Pages::consoleCommand(QString &command)
 {
-   consoleInput(command);
+   int conn;
+   bool donotify = false;
+   if (m_console->availableDirComm(conn))  {
+      if (m_console->is_notify_enabled(conn)) {
+         donotify = true;
+         m_console->notify(conn, false);
+      }
+      consoleCommand(command, conn);
+      if (donotify) { m_console->notify(conn, true); }
+   }
 }
-
-/*
- * Function to simplify executing a console command, but does not
- *  check for the connection in use.  We need this so that we can
- *  *always* enter command from the command line.
- */
-void Pages::consoleInput(QString &command)
+void Pages::consoleCommand(QString &command, int conn)
 {
-   int conn;
    /* Bring this director's console to the front of the stack */
    setConsoleCurrent();
    QString displayhtml("<font color=\"blue\">");
    displayhtml += command + "</font>\n";
    m_console->display_html(displayhtml);
    m_console->display_text("\n");
-   conn = m_console->write_dir(command.toUtf8().data());
+   mainWin->waitEnter();
+   m_console->write_dir(conn, command.toUtf8().data(), false);
    m_console->displayToPrompt(conn);
+   mainWin->waitExit();
 }
 
 /*