From 792ffee3ff95b838f7d4d293b31f6e935355e134 Mon Sep 17 00:00:00 2001 From: Dirk H Bartley Date: Fri, 27 Jul 2007 21:01:25 +0000 Subject: [PATCH] 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 --- bacula/src/qt-console/restore/restoretreerun.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bacula/src/qt-console/restore/restoretreerun.cpp b/bacula/src/qt-console/restore/restoretreerun.cpp index 04acf86f0c..c72442cdc5 100644 --- 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; -- 2.39.5