Re-Add client="client" to restore command. Play a little with the

[bacula/bacula] / bacula / src / qt-console / restore / restoretree.cpp

diff --git a/bacula/src/qt-console/restore/restoretree.cpp b/bacula/src/qt-console/restore/restoretree.cpp
index b2e5b7b3f8d2b3f3589bdfeb37d8ed8be279b10b..17b1e8f8e40dfbb008412ed9208c64e87e12913f 100644 (file)
--- a/bacula/src/qt-console/restore/restoretree.cpp
+++ b/bacula/src/qt-console/restore/restoretree.cpp
@@ -224,9 +224,8 @@ void restoreTree::populateDirectoryTree()
          m_jobQuery += " LIMIT " + limit;
       }
 
-      if (mainWin->m_sqlDebug) {
-         Pmsg1(000, "Query cmd : %s\n", m_jobQuery.toUtf8().data());
-      }
+      if (mainWin->m_rtPopDirDebug)
+         Pmsg1(000, "m_jobQuery : %s\n", m_jobQuery.toUtf8().data());
       prBar1->setValue(ontask++);
       prLabel1->setText("Task " + QString("%1").arg(ontask)+ " of " + QString("%1").arg(taskcount));
       prBar2->setValue(0);
@@ -691,9 +690,8 @@ void restoreTree::populateJobTable()
       limit.setNum(limitSpinBox->value());
       jobQuery += " LIMIT " + limit;
    }
-   if (mainWin->m_sqlDebug) {
+   if (mainWin->m_sqlDebug)
       Pmsg1(000, "Query cmd : %s\n", jobQuery.toUtf8().data());
-   }
 
    QStringList results;
    if (m_console->sql_cmd(jobQuery, results)) {
@@ -1588,6 +1586,7 @@ void restoreTree::restoreButtonPushed()
       jobOption += "\"";
       QString cmd = QString("restore");
       cmd += jobOption +
+             " client=\"" + m_prevClientCombo + "\"" +
              " file=\"?" + tempTable + "\" done";
       if (mainWin->m_commandDebug)
          Pmsg1(000, "preRestore command \'%s\'\n", cmd.toUtf8().data());