[style dock] Reduce timeout on undo stack

qgis · Jul 7, 2016 · 564c02e · 564c02e
1 parent f9d839f
commit 564c02e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/app/qgslayerstylingwidget.cpp b/src/app/qgslayerstylingwidget.cpp
@@ -489,7 +489,9 @@ bool QgsMapLayerStyleCommand::mergeWith( const QUndoCommand* other )
 
   // only merge commands if they are created shortly after each other
   // (e.g. user keeps modifying one property)
-  if ( mTime.msecsTo( otherCmd->mTime ) > 3000 )
+  QSettings settings;
+  int timeout = settings.value( "/UI/styleUndoMergeTimeout", 500 ).toInt();
+  if ( mTime.msecsTo( otherCmd->mTime ) > timeout )
     return false;
 
   mXml = otherCmd->mXml;