Mercurial > hg > easyhg-kdiff3

changeset 24:7cbcebe2b3e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ProgressDialog::show(): show only if not visible.
author joachim99
date Sat, 11 Oct 2003 12:38:58 +0000
parents 6daffd081b7e
children d101155f5c52
files kdiff3/src/fileaccess.cpp
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/kdiff3/src/fileaccess.cpp	Tue Oct 07 20:02:22 2003 +0000
+++ b/kdiff3/src/fileaccess.cpp	Sat Oct 11 12:38:58 2003 +0000
@@ -443,7 +443,7 @@
 bool FileAccess::symLink( const QString& linkTarget, const QString& linkLocation )
 {
 #ifdef _WIN32
-  return false;
+   return false;
 #else
    return 0==::symlink( linkTarget.ascii(), linkLocation.ascii() );
    //FileAccessJobHandler fh(0);
@@ -1485,11 +1485,14 @@
 #include <qtimer.h>
 void ProgressDialog::show()
 {
+   if ( !isVisible() )
+   {
 #if QT_VERSION==230
-   QWidget::show();
+      QWidget::show();
 #else
-   QDialog::show();
+      QDialog::show();
 #endif
+   }
 }
 
 void ProgressDialog::hide()