- wxbRestorePanel : Fixed crash when an error occurs while querying restore list...

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

diff --git a/bacula/src/wx-console/CHANGELOG b/bacula/src/wx-console/CHANGELOG
index f07925b9fff729d06be6028878ce4a8588de1b1d..ac97a086827aaed0ed72a0fc4cfbb54f13b9470f 100644 (file)
--- a/bacula/src/wx-console/CHANGELOG
+++ b/bacula/src/wx-console/CHANGELOG
@@ -1,3 +1,7 @@
+16-07-2004 :
+ - wxbRestorePanel : Fixed crash when an error occurs while querying
+    restore list (reported by Dan Langille).
+
 15-07-2004 :
  - wxbMainFrame : When an unexpected question is in this format 
     (***? (yes/mod/no):), a list is shown to choose one of these 

diff --git a/bacula/src/wx-console/wxbrestorepanel.cpp b/bacula/src/wx-console/wxbrestorepanel.cpp
index d4f2388b5f6a9951ca166158170d51ab319384bb..1783446fc8de3a2e6a150a975cd0b625257263b3 100644 (file)
--- a/bacula/src/wx-console/wxbrestorepanel.cpp
+++ b/bacula/src/wx-console/wxbrestorepanel.cpp
@@ -1123,6 +1123,14 @@ void wxbRestorePanel::CmdListJobs() {
                delete dt;
                return;
             }
+            else if (((*dt)[i].Index("ERROR") > -1) || ((*dt)[i].Index("Query failed") > -1)) {
+               configPanel->AddRowChoice("Before", "Cannot get previous backups list, see console.");
+               configPanel->SetRowSelection("Before", 0);
+               configPanel->EnableApply(true); // Enabling the not existing apply button disables the ok button.
+               delete tableparser;
+               delete dt;
+               return;
+            }
          }
       }