[Kst] extragear/graphics/kst/kst

[George Staikos]

SVN commit 462197 by staikos:

synchronize with the branch.  also add a fix for locking in the dialog.


 M  +5 -2      kstchangenptsdialog_i.cpp  


--- trunk/extragear/graphics/kst/kst/kstchangenptsdialog_i.cpp #462196:462197
@@ -69,14 +69,15 @@
     }
     rvl[i]->readUnlock();
   }
-  return qsl.count()>0;
+  return !qsl.isEmpty();
 }
 
 void KstChangeNptsDialogI::showChangeNptsDialog() {
   bool some_slected = updateChangeNptsDialog();
   updateDefaults(0);
-  if (!some_slected) 
+  if (!some_slected) {
     CurveList->selectAll(true);
+  }
   show();
   raise();
 }
@@ -87,6 +88,7 @@
     if (CurveList->isSelected(i_vector)) {
       KstRVectorPtr vector = rvl[i_vector];
       int f0, n;
+      vector->readLock();
       if (_kstDataRange->isTime() && vector->dataSource()) {
         vector->dataSource()->readLock();
         f0 = vector->dataSource()->sampleForTime(_kstDataRange->f0Value());
@@ -96,6 +98,7 @@
         f0 = _kstDataRange->f0Value();
         n = _kstDataRange->nValue();
       }
+      vector->readUnlock();
       vector->writeLock();
       vector->changeFrames(
         (_kstDataRange->CountFromEnd->isChecked() ? -1 : f0),