Remove some of the .mod commands to after the yes. These seem to be ignored.

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

diff --git a/bacula/src/qt-console/restore/restoretreerun.cpp b/bacula/src/qt-console/restore/restoretreerun.cpp
index 04acf86f0cf95ed91c67e604ee0640d1fe2fba1f..c72442cdc5b8067de61d8fab5a83a1afe0ce530e 100644 (file)
--- a/bacula/src/qt-console/restore/restoretreerun.cpp
+++ b/bacula/src/qt-console/restore/restoretreerun.cpp
@@ -72,6 +72,7 @@ void restoreTreeRunPage::fill()
 {
    QDateTime dt;
    clientCombo->addItems(m_console->client_list);
+   clientCombo->setCurrentIndex(clientCombo->findText(m_client, Qt::MatchExactly));
    replaceCombo->addItems(QStringList() << "never" << "always" << "ifnewer" << "ifolder");
    replaceCombo->setCurrentIndex(replaceCombo->findText("never", Qt::MatchExactly));
    dateTimeEdit->setDisplayFormat(mainWin->m_dtformat);
@@ -89,9 +90,11 @@ void restoreTreeRunPage::okButtonPushed()
    }
    jobOption += "\"";
    QString cmd = QString("restore");
-   cmd += " client=\"" + m_client + "\""
-          + jobOption + 
-          " file=\"?" + m_tempTable + "\" yes";
+   cmd += jobOption + 
+          " file=\"?" + m_tempTable + "\" yes"
+          " replace=\"" + replaceCombo->currentText() + "\""
+          " when=\"" + dateTimeEdit->dateTime().toString(mainWin->m_dtformat) + "\""
+          " restoreclient=\"" + clientCombo->currentText() + "\"";
    if (mainWin->m_commandDebug)
       Pmsg1(000, "preRestore command \'%s\'\n", cmd.toUtf8().data());
    consoleCommand(cmd);
@@ -99,9 +102,6 @@ void restoreTreeRunPage::okButtonPushed()
    closeStackPage();
 
 /*   QString cmd(".mod");
-   cmd += " restoreclient=\"" + clientCombo->currentText() + "\"";
-   cmd += " replace=\"" + replaceCombo->currentText() + "\"";
-   cmd += " when=\"" + dateTimeEdit->dateTime().toString(mainWin->m_dtformat) + "\"";
    cmd += " bootstrap=\"" + bootstrap->text() + "\"";
    cmd += " where=\"" + where->text() + "\"";
    QString pri;