Merge branch 'master' into gtk3

2015-09-16 21:04:25 +02:00
parent 7d9f743ce5 3935c6b2aa
commit eefc81b94b
21 changed files with 123 additions and 149 deletions
--- a/rtgui/xtransprocess.cc
+++ b/rtgui/xtransprocess.cc
@@ -42,8 +42,8 @@ XTransProcess::XTransProcess () : FoldableToolPanel(this, "xtransprocess", M("TP
    ccSteps = Gtk::manage (new Adjuster (M("TP_RAW_FALSECOLOR"), 0, 5, 1, 0 ));
    ccSteps->setAdjusterListener (this);

-    if (ccSteps->delay < 1000) {
-        ccSteps->delay = 1000;
+    if (ccSteps->delay < options.adjusterMaxDelay) {
+        ccSteps->delay = options.adjusterMaxDelay;
    }

    ccSteps->show();