Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

diff --git a/ChangeLog b/ChangeLog
index 0f3b2b567147998859812dd22793cbb504811785..6f5bbb0ffa89d022e3ba258d2b325aa0cd398323 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-09-16  Carl Hetherington  <cth@carlh.net>
+
+       * Fix non-update of audio gain when changing selected content.
+
 2014-09-14  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.73.6 released.

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 23a85534a2123fbbad1fb58c8ec5e1f43b52618c..1e501f54fd5650a892b0ab5a2d189ba950482eac 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -193,7 +193,7 @@ void
 checked_set (wxSpinCtrlDouble* widget, double value)
 {
        /* XXX: completely arbitrary epsilon */
-       if (fabs (widget->GetValue() - value) < 1e-16) {
+       if (fabs (widget->GetValue() - value) > 1e-16) {
                widget->SetValue (value);
        }
 }