[Bacula-commits] bacula/src/wx-console wxbrestorepanel.cpp,1.61,1.62

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/bacula/bacula/src/wx-console
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27721

Modified Files:
	wxbrestorepanel.cpp 
Log Message:
Fix bug #452.

Index: wxbrestorepanel.cpp
===================================================================
RCS file: /cvsroot/bacula/bacula/src/wx-console/wxbrestorepanel.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- wxbrestorepanel.cpp	18 Oct 2005 22:38:30 -0000	1.61
+++ wxbrestorepanel.cpp	26 Oct 2005 14:09:14 -0000	1.62
@@ -1447,7 +1447,7 @@
 
          while (treeid.IsOk()) {
             itemStr = ((wxbTreeItemData*)tree->GetItemData(treeid))->GetName();
-            if (entry.fullname == itemStr) {
+            if (entry.filename == itemStr) {
                if (static_cast<wxbTreeItemData*>(tree->GetItemData(treeid))->GetMarked() != entry.marked) {
                   tree->SetItemImage(treeid, entry.marked, wxTreeItemIcon_Normal);
                   tree->SetItemImage(treeid, entry.marked, wxTreeItemIcon_Selected);
@@ -1463,13 +1463,13 @@
          }
 
          if (!updated) {
-            treeid = tree->AppendItem(item, wxbUtils::ConvertToPrintable(entry.filename), entry.marked, entry.marked, new wxbTreeItemData(entry.filename, entry.fullname, entry.marked));
+            treeid = tree->AppendItem(item, wxbUtils::ConvertToPrintable(entry.filename), entry.marked, entry.marked, new wxbTreeItemData(entry.fullname, entry.filename, entry.marked));
          }
       }
 
       if (updatelist) {
          long ind = list->InsertItem(list->GetItemCount(), entry.marked);
-         wxbTreeItemData* data = new wxbTreeItemData(entry.filename, entry.fullname, entry.marked, ind);
+         wxbTreeItemData* data = new wxbTreeItemData(entry.fullname, entry.filename, entry.marked, ind);
          data->SetId(treeid);
          list->SetItemData(ind, (long)data);
          list->SetItem(ind, 1, wxbUtils::ConvertToPrintable(entry.filename));