Fixed a small mistake in restore process (return instead of break...)

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

diff --git a/bacula/src/wx-console/wxbrestorepanel.cpp b/bacula/src/wx-console/wxbrestorepanel.cpp
index 5a39e9ba4f449795c73ae0884309abddc79de6a3..add8cba5cc9c6f2bbca1b635f77da94fc081e09a 100644 (file)
--- a/bacula/src/wx-console/wxbrestorepanel.cpp
+++ b/bacula/src/wx-console/wxbrestorepanel.cpp
@@ -315,16 +315,16 @@ void wxbRestorePanel::CmdStart() {
       totfilemessages = 0;
       wxbDataTokenizer* dt;
       
-      dt = WaitForEnd("estimate\n");
+      dt = WaitForEnd("estimate\n", true);
       
       int j, k;
-      
+          
       for (unsigned int i = 0; i < dt->GetCount(); i++) {
          /* 15847 total files; 1 marked to be restored; 1,034 bytes. */
          if ((j = (*dt)[i].Find(" marked to be restored;")) > -1) {
             k = (*dt)[i].Find("; ");
             (*dt)[i].Mid(k+2, j).ToLong(&totfilemessages);
-            return;
+            break;
          }
       }
       
@@ -335,12 +335,12 @@ void wxbRestorePanel::CmdStart() {
       for (unsigned int i = 0; i < dt->GetCount(); i++) {
          if ((j = (*dt)[i].Find(" files selected to be restored.")) > -1) {
             (*dt)[i].Mid(0, j).ToLong(&totfilemessages);
-            return;
+            break;
          }
 
          if ((j = (*dt)[i].Find(" file selected to be restored.")) > -1) {
             (*dt)[i].Mid(0, j).ToLong(&totfilemessages);
-            return;
+            break;
          }
       }
       
@@ -579,13 +579,18 @@ wxbDataTokenizer* wxbRestorePanel::WaitForEnd(wxString cmd, bool keepresults) {
    wxbDataTokenizer* datatokenizer = new wxbDataTokenizer();
 
    wxbMainFrame::GetInstance()->Send(cmd);
-
+   
+   //wxbMainFrame::GetInstance()->Print("(<WFE)", CS_DEBUG);
+   
    //time_t base = wxDateTime::Now().GetTicks();
    while (!datatokenizer->hasFinished()) {
       //innerThread->Yield();
       wxTheApp->Yield();
       //if (base+15 < wxDateTime::Now().GetTicks()) break;
    }
+   
+   //wxbMainFrame::GetInstance()->Print("(>WFE)", CS_DEBUG);
+   
    if (keepresults) {
       return datatokenizer;
    }

diff --git a/bacula/src/wx-console/wxbutils.cpp b/bacula/src/wx-console/wxbutils.cpp
index e639144dee77896d901fd88cb8377de481dba79c..3f2fd4fcc58166435bd879a916c30555835c5c18 100644 (file)
--- a/bacula/src/wx-console/wxbutils.cpp
+++ b/bacula/src/wx-console/wxbutils.cpp
@@ -57,7 +57,9 @@ void wxbDataTokenizer::Print(wxString str, int status) {
 
    if (str != "") {
       Add(str);
+      //wxbMainFrame::GetInstance()->Print("D", CS_DEBUG);
    }
+   //wxbMainFrame::GetInstance()->Print(finished ? "F" : "!F", CS_DEBUG);
 }
 
 /* Returns true if the last signal received was an end signal,