Commit bbcce00e authored by Christian Loose's avatar Christian Loose
Browse files

Fixed "fetch of branch list hangs in update dialog" (#50824)

svn path=/trunk/kdesdk/cervisia/; revision=194483
parent a30478a7
2002-12-17 Christian Loose <christian.loose@hamburg.de>
* Fixed "fetch of branch list hangs in update dialog" (#50824)
2002-12-12 Christian Loose <christian.loose@hamburg.de> 2002-12-12 Christian Loose <christian.loose@hamburg.de>
* Fix the too small scroll area of diff view when * Fix the too small scroll area of diff view when
......
...@@ -73,6 +73,7 @@ CvsProgressDialog::CvsProgressDialog(const QString &text, QWidget *parent) ...@@ -73,6 +73,7 @@ CvsProgressDialog::CvsProgressDialog(const QString &text, QWidget *parent)
shown = false; shown = false;
cancelled = false; cancelled = false;
hasError = false;
} }
...@@ -188,6 +189,7 @@ bool CvsProgressDialog::processOutput() ...@@ -188,6 +189,7 @@ bool CvsProgressDialog::processOutput()
item.left(21) == "cvs [server aborted]:") item.left(21) == "cvs [server aborted]:")
{ {
err = true; err = true;
hasError = true;
resultbox->insertItem(item); resultbox->insertItem(item);
} }
else if (item.left(11) == "cvs server:") else if (item.left(11) == "cvs server:")
...@@ -234,7 +236,7 @@ void CvsProgressDialog::childExited() ...@@ -234,7 +236,7 @@ void CvsProgressDialog::childExited()
// Close the dialog automatically if there are no // Close the dialog automatically if there are no
// error messages or the process has been aborted // error messages or the process has been aborted
// 'by hand' (e.g. by clicking the cancel button) // 'by hand' (e.g. by clicking the cancel button)
if (resultbox->count() < 2 || !childproc->normalExit()) if (!hasError || !childproc->normalExit())
kapp->exit_loop(); kapp->exit_loop();
} }
......
...@@ -56,6 +56,7 @@ private: ...@@ -56,6 +56,7 @@ private:
bool shown; bool shown;
bool cancelled; bool cancelled;
bool hasError;
QString indic1, indic2; QString indic1, indic2;
KProcess *childproc; KProcess *childproc;
QListBox *resultbox; QListBox *resultbox;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment