Fixes to get restoration to work with multiple connections.

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

diff --git a/bacula/src/qt-console/bcomm/dircomm.cpp b/bacula/src/qt-console/bcomm/dircomm.cpp
index 180027319d87322781117808f265975eb8259937..0fdcfb79338edbe0065ac60940cf9c0e6033d9bd 100644 (file)
--- a/bacula/src/qt-console/bcomm/dircomm.cpp
+++ b/bacula/src/qt-console/bcomm/dircomm.cpp
@@ -359,7 +359,7 @@ int DirComm::read()
          break;
       case BNET_RUN_CMD:
          if (mainWin->m_commDebug) Pmsg1(000, "conn %i RUN CMD\n", m_conn);
-         new runCmdPage();
+         new runCmdPage(m_conn);
          break;
       case BNET_START_RTREE:
          if (mainWin->m_commDebug) Pmsg1(000, "conn %i START RTREE CMD\n", m_conn);

diff --git a/bacula/src/qt-console/run/run.h b/bacula/src/qt-console/run/run.h
index 40e1728940410009406b1e51d228f0cd7a23906a..70693f473f63acbf4d3e8e0f9c3401d55478809a 100644 (file)
--- a/bacula/src/qt-console/run/run.h
+++ b/bacula/src/qt-console/run/run.h
@@ -30,7 +30,7 @@ class runCmdPage : public Pages, public Ui::runCmdForm
    Q_OBJECT 
 
 public:
-   runCmdPage();
+   runCmdPage(int conn);
 
 public slots:
    void okButtonPushed();

diff --git a/bacula/src/qt-console/run/runcmd.cpp b/bacula/src/qt-console/run/runcmd.cpp
index ce1f7d582012ee9a857c77e45a46ca9effd5fb94..f511b10d5a6ccfb21ea958166efbc0f0a6fff37f 100644 (file)
--- a/bacula/src/qt-console/run/runcmd.cpp
+++ b/bacula/src/qt-console/run/runcmd.cpp
@@ -46,14 +46,15 @@
 /*
  * Setup all the combo boxes and display the dialog
  */
-runCmdPage::runCmdPage()
+runCmdPage::runCmdPage(int conn)
 {
    m_name = tr("Restore Run");
    pgInitialize();
    setupUi(this);
    QTreeWidgetItem* thisitem = mainWin->getFromHash(this);
    thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/restore.png")));
-   m_conn = m_console->notifyOff();
+   m_conn = conn;
+   m_console->notify(conn, false);
 
    fill();
    m_console->discardToPrompt(m_conn);
@@ -160,7 +161,7 @@ void runCmdPage::okButtonPushed()
    displayhtml += cmd + "</font>\n";
    m_console->display_html(displayhtml);
    m_console->display_text("\n");
-   m_console->write_dir(cmd.toUtf8().data());
+   m_console->write_dir(m_conn, cmd.toUtf8().data());
    m_console->displayToPrompt(m_conn);
 //   consoleCommand(cmd); ***FIXME set back to consoleCommand when connection issue is resolved