This is the fix to http://bugs.bacula.org/view.php?id=1276. The select

class was just not working with the new requirements of setting and clearing the
notify.

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

diff --git a/bacula/src/qt-console/bcomm/dircomm.cpp b/bacula/src/qt-console/bcomm/dircomm.cpp
index 700d53dc1503f2500fb0c1a132aaccc6a8400986..387794425339a859e5126f27d23ab1302c267348 100644 (file)
--- a/bacula/src/qt-console/bcomm/dircomm.cpp
+++ b/bacula/src/qt-console/bcomm/dircomm.cpp
@@ -353,8 +353,9 @@ int DirComm::read()
          }
          continue;
       case BNET_START_SELECT:
+         notify(false);
          if (mainWin->m_commDebug) Pmsg1(000, "conn %i START SELECT\n", m_conn);
-         new selectDialog(m_console);
+         new selectDialog(m_console, m_conn);
          break;
       case BNET_YESNO:
          if (mainWin->m_commDebug) Pmsg1(000, "conn %i YESNO\n", m_conn);

diff --git a/bacula/src/qt-console/select/select.cpp b/bacula/src/qt-console/select/select.cpp
index 9d6cd5a0e682c78d610b45e03d1bf928a6eb21a2..eaa138afda9aaf86cb533726a194e85d97e7c4a8 100644 (file)
--- a/bacula/src/qt-console/select/select.cpp
+++ b/bacula/src/qt-console/select/select.cpp
@@ -40,8 +40,9 @@
 /*
  * Read the items for the selection
  */
-selectDialog::selectDialog(Console *console) 
+selectDialog::selectDialog(Console *console, int conn) 
 {
+   m_conn = conn;
    QDateTime dt;
    int stat;
    QListWidgetItem *item;
@@ -51,7 +52,6 @@ selectDialog::selectDialog(Console *console)
    setupUi(this);
    connect(listBox, SIGNAL(currentRowChanged(int)), this, SLOT(index_change(int)));
    setAttribute(Qt::WA_DeleteOnClose);
-   m_conn = m_console->notifyOff();
    m_console->read(m_conn);                 /* get title */
    labelWidget->setText(m_console->msg(m_conn));
    while ((stat=m_console->read(m_conn)) > 0) {
@@ -69,12 +69,12 @@ void selectDialog::accept()
 
    this->hide();
    bsnprintf(cmd, sizeof(cmd), "%d", m_index+1);
-   m_console->write_dir(cmd);
+   m_console->write_dir(m_conn, cmd);
    m_console->displayToPrompt(m_conn);
    this->close();
    mainWin->resetFocus();
    m_console->displayToPrompt(m_conn);
-
+   m_console->notify(m_conn, true);
 }
 
 
@@ -85,6 +85,7 @@ void selectDialog::reject()
    this->close();
    mainWin->resetFocus();
    m_console->beginNewCommand(m_conn);
+   m_console->notify(m_conn, true);
 }
 
 /*

diff --git a/bacula/src/qt-console/select/select.h b/bacula/src/qt-console/select/select.h
index 21be1b1518b8219ab5e7f0c1f24d1aa6c679aa15..1d3aabbb9972caf19f59de40ba8bad3d74f5d1e0 100644 (file)
--- a/bacula/src/qt-console/select/select.h
+++ b/bacula/src/qt-console/select/select.h
@@ -11,7 +11,7 @@ class selectDialog : public QDialog, public Ui::selectForm
    Q_OBJECT 
 
 public:
-   selectDialog(Console *console);
+   selectDialog(Console *console, int conn);
 
 public slots:
    void accept();