Index: CHANGELOG
===================================================================
RCS file: /cvsroot/bacula/bacula/src/wx-console/CHANGELOG,v
retrieving revision 1.42.8.2
retrieving revision 1.42
diff -r1.42.8.2 -r1.42
1,9d0
< 24-03-2005 :
<  - wxbMainFrame : Fix a bug with GTK+-1.2 which caused wx-console to crash
<    when starting.
<  - wxbRestorePanel : Fix a major bug which caused wx-console to enter in an
<    infinite loop which allocate a lot of memory and could make the system crash.
< 
< 10-03-2005 :
<  - wxbMainFrame : Fix bug #0000221 (Debian 292517)
< 
Index: wxbmainframe.cpp
===================================================================
RCS file: /cvsroot/bacula/bacula/src/wx-console/wxbmainframe.cpp,v
retrieving revision 1.30.6.2
retrieving revision 1.30
diff -r1.30.6.2 -r1.30
7c7
<  *    Version $Id: 1.36.2-wx-console-bugfixes.diff 1961 2005-04-26 19:29:24Z kerns $
---
>  *    Version $Id: 1.36.2-wx-console-bugfixes.diff 1961 2005-04-26 19:29:24Z kerns $
210,211d209
<    lockedbyconsole = false;
<    
317a316,317
>    lockedbyconsole = false;
>    
650,651c650,651
<             if (res == -1) { //Cancel pressed
<                Send(".\n");
---
>             if (res == -1) {
>                Send("\n");
Index: wxbrestorepanel.cpp
===================================================================
RCS file: /cvsroot/bacula/bacula/src/wx-console/wxbrestorepanel.cpp,v
retrieving revision 1.40.8.1
retrieving revision 1.40
diff -r1.40.8.1 -r1.40
7c7
<  *    Version $Id: 1.36.2-wx-console-bugfixes.diff 1961 2005-04-26 19:29:24Z kerns $
---
>  *    Version $Id: 1.36.2-wx-console-bugfixes.diff 1961 2005-04-26 19:29:24Z kerns $
411c411
<    markWhenCommandDone = false;
---
>    markWhenListingDone = false;
1987a1988
>       AddPendingEvent(event);
1996a1998
>       AddPendingEvent(event);
2002a2005
>       AddPendingEvent(event);
2015a2019
>       AddPendingEvent(event);
2024c2028
<    markWhenCommandDone = false;
---
>    markWhenListingDone = false;
2028c2032
<    if (markWhenCommandDone) {
---
>    if (markWhenListingDone) {
2041a2046
>    csprint("Tree marked", CS_DEBUG);
2044c2049
<          markWhenCommandDone = !markWhenCommandDone;
---
>          markWhenListingDone = !markWhenListingDone;
2045a2051
>       AddPendingEvent(event);
2049d2054
<    markWhenCommandDone = false;
2051,2054c2056
<    if (markWhenCommandDone) {
<       CmdMark(event.GetItem(), NULL, 0);
<       tree->Refresh();
<    }
---
>    //event.Skip();
2065a2068
>       AddPendingEvent(event);
2080a2084
>       AddPendingEvent(event);
2095a2100
>       AddPendingEvent(event);
2105a2111,2112
>       AddPendingEvent(event);
>       //event.Skip();
2125c2132
<    
---
>      
2140a2148,2149
>       AddPendingEvent(event);
>       //event.Skip();
2176a2186
>       AddPendingEvent(event);
2212a2223
>       AddPendingEvent(event);
2241a2253
>       AddPendingEvent(event);
2270a2283
>       AddPendingEvent(event);
Index: wxbrestorepanel.h
===================================================================
RCS file: /cvsroot/bacula/bacula/src/wx-console/wxbrestorepanel.h,v
retrieving revision 1.19.10.1
retrieving revision 1.19
diff -r1.19.10.1 -r1.19
7c7
<  *    Version $Id: 1.36.2-wx-console-bugfixes.diff 1961 2005-04-26 19:29:24Z kerns $
---
>  *    Version $Id: 1.36.2-wx-console-bugfixes.diff 1961 2005-04-26 19:29:24Z kerns $
154c154
<       bool markWhenCommandDone; //If an item should be (un)marked after the current listing/marking is done
---
>       bool markWhenListingDone;