- Fix seg fault when clicking on Add button in wx-console

  restore panel.  Bug #470.
- Fix copyright date and URL typo -- bug #468.

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

diff --git a/bacula/kes-1.38 b/bacula/kes-1.38
index 10ca819415377802c717844aea10452c777f3f6c..b4eb64c7a4c7387ba0559461cdc29676f72e7fc6 100644 (file)
--- a/bacula/kes-1.38
+++ b/bacula/kes-1.38
@@ -4,6 +4,9 @@
 General:
 
 Changes to 1.38.1:
+- Fix seg fault when clicking on Add button in wx-console
+  restore panel.  Bug #470.
+- Fix copyright date and URL typo -- bug #468.
 - Change autostart install for FreeBSD to look for rc.conf  
   rather than rc.local as suggested fix for bug #466.
 - Apply patch supplied by Eric Bollinger to fix PostgreSQL    

diff --git a/bacula/kes-1.39 b/bacula/kes-1.39
index b555be0597a93f9a59ee7a30d9c3627ea0067e46..0352d743f3e270307ebb29c9163775fa60cb1e03 100644 (file)
--- a/bacula/kes-1.39
+++ b/bacula/kes-1.39
@@ -4,6 +4,9 @@
 General:
 
 Changes to 1.39.0:
+- Fix seg fault when clicking on Add button in wx-console
+  restore panel.  Bug #470.
+- Fix copyright date and URL typo -- bug #468.
 - Change autostart install for FreeBSD to look for rc.conf  
   rather than rc.local as suggested fix for bug #466.
 - Apply patch supplied by Eric Bollinger to fix PostgreSQL    

diff --git a/bacula/src/filed/win32/winres.rc b/bacula/src/filed/win32/winres.rc
index 83a61471849bf0ff60aeb074aa0b4f2e3af4e22c..51adfd74919a440ae6e4cfdd003e03168800f638 100644 (file)
--- a/bacula/src/filed/win32/winres.rc
+++ b/bacula/src/filed/win32/winres.rc
@@ -68,7 +68,7 @@ BEGIN
             VALUE "FileDescription", "Bacula File daemon for Win32\0"
             VALUE "FileVersion", VERSION "\0"
             VALUE "InternalName", "Bacula\0"
-            VALUE "LegalCopyright", "Copyright Kern Sibbald, 1999-2004\0"
+            VALUE "LegalCopyright", "Copyright Kern Sibbald, 1999-2005\0"
             VALUE "LegalTrademarks", "Licensed under GNU GPL 2.0\0"
             VALUE "OriginalFilename", "filed.exe\0"
             VALUE "PrivateBuild", "\0"
@@ -138,10 +138,10 @@ BEGIN
 
     LTEXT           N_("      by Kern Sibbald"),IDC_NAME,134,38,78,10
     LTEXT           N_("For more information, see:"),-1,115,60,100,10
-    LTEXT           "         www.bacula.ord",IDC_WWW,115,70,100,10
+    LTEXT           "         www.bacula.org",IDC_WWW,115,70,100,10
 //    LTEXT           "                 ",-1,69,81,100,10
 //    LTEXT           "                 ",-1,90,70,100,10
-    LTEXT           "Copyright (C) 1999-2004, Kern Sibbald",IDC_COPYRIGHT,7,120,175,10
+    LTEXT           "Copyright (C) 1999-2005, Kern Sibbald",IDC_COPYRIGHT,7,120,175,10
     LTEXT           N_("Licensed under GNU GPL 2.0."),IDC_TRADEMARK,7,130,175,10
     RTEXT           N_("Build Date:"),-1,108,24,42,8
     RTEXT           N_("Bacula Version:"),-1,100,9,50,8

diff --git a/bacula/src/wx-console/wxbrestorepanel.cpp b/bacula/src/wx-console/wxbrestorepanel.cpp
index 61922d800202275d81b30f64fe3f840688a909df..962b8e30e8b35b4b81264e14aa565663b845984f 100644 (file)
--- a/bacula/src/wx-console/wxbrestorepanel.cpp
+++ b/bacula/src/wx-console/wxbrestorepanel.cpp
@@ -1282,7 +1282,7 @@ void wxbRestorePanel::CmdMark(wxTreeItemId treeitem, long* listitems, int listsi
       }
       
       if (listitems != NULL) {
-         for (int i = 0; i < listsize; i++) {
+         for (int i = 0; i < itemdatasize; i++) {
             itemdata[i] = (wxbTreeItemData*)list->GetItemData(listitems[i]);
          }
       }
@@ -1373,7 +1373,7 @@ void wxbRestorePanel::CmdMark(wxTreeItemId treeitem, long* listitems, int listsi
          treeitem = tree->GetItemParent(treeitem);*/
       }
       else {
-         for (int i = 0; i < listsize; i++) {
+         for (int i = 0; i < itemdatasize; i++) {
             SetListItemState(listitems[i], state);
          }
          listadd->Enable(state == 0);