[Kst] branches/kst/1.3/kst/src/libkstapp

George Staikos staikos at kde.org
Wed Sep 27 01:47:56 CEST 2006


SVN commit 588804 by staikos:

backport locking fix and also ">" -> ">=" as adjusted in trunk.  messages not
changed.


 M  +1 -3      kstimagedialog_i.cpp  


--- branches/kst/1.3/kst/src/libkstapp/kstimagedialog_i.cpp #588803:588804
@@ -280,7 +280,6 @@
     double lowerZDouble, upperZDouble;
     if (!checkParameters(lowerZDouble, upperZDouble)) {
       KMessageBox::sorry(this, i18n("Image type was changed: Lower Z threshold cannot be higher than Upper Z threshold."));
-      pMatrix->unlock();
       imPtr->unlock();
       return false;
     }
@@ -356,7 +355,6 @@
     if (imPtr->hasColorMap()) {
       if (pLowerZ > pUpperZ) {
         KMessageBox::sorry(this, i18n("The Lower Z threshold cannot be higher than Upper Z threshold."));
-        pMatrix->unlock();
         imPtr->unlock();
         return false;
       }
@@ -550,7 +548,7 @@
       KMessageBox::sorry(this, i18n("The upper and lower thresholds are not valid.  Enter valid decimal numbers for the thresholds."));
       return false;
     }
-    if (lowerZDouble > upperZDouble) {
+    if (lowerZDouble >= upperZDouble) {
       KMessageBox::sorry(this, i18n("The lower threshold cannot be greater than the upper threshold."));
       return false;
     }


More information about the Kst mailing list