Should prevent a page from coming to the front that has not yet been populated

when doing a restore.

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

diff --git a/bacula/src/qt-console/restore/prerestore.cpp b/bacula/src/qt-console/restore/prerestore.cpp
index 80cfc2ef887b4589546595c595c1d60ab5c740f7..22937db684917c6c9420d4f9ce57fba083186744 100644 (file)
--- a/bacula/src/qt-console/restore/prerestore.cpp
+++ b/bacula/src/qt-console/restore/prerestore.cpp
@@ -110,6 +110,7 @@ void prerestorePage::okButtonPushed()
    consoleCommand(cmd);
    /* Note, do not turn notifier back on here ... */
    if (selectFilesRadio->isChecked()) {
+      setConsoleCurrent();
       new restorePage();
       closeStackPage();
    } else {

diff --git a/bacula/src/qt-console/restore/restore.cpp b/bacula/src/qt-console/restore/restore.cpp
index f8107f1c68b8378cde9a694dbd896b0843ee97c9..b6480079f4dbcfc3c7c582ca2bdf77d60c9d39ec 100644 (file)
--- a/bacula/src/qt-console/restore/restore.cpp
+++ b/bacula/src/qt-console/restore/restore.cpp
@@ -228,6 +228,7 @@ void restorePage::okButtonPushed()
    this->hide();
    m_console->write("done");
    m_console->notify(true);
+   setConsoleCurrent();
    closeStackPage();
    mainWin->resetFocus();
 }