From 995962291a386229087656ec8ceaf01d66004955 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 20 Sep 2016 01:20:22 +0200 Subject: options: fix window-scale property A recent change merged the window-scaler option and property, but forgot that the option is float for some reason, while the property uses double. This led to undefined behavior. Fix it by changing the option to double too. --- options/options.c | 2 +- options/options.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'options') diff --git a/options/options.c b/options/options.c index 533dda244c..70d921ab73 100644 --- a/options/options.c +++ b/options/options.c @@ -156,7 +156,7 @@ static const m_option_t mp_vo_opt_list[] = { OPT_SIZE_BOX("autofit", autofit, 0), OPT_SIZE_BOX("autofit-larger", autofit_larger, 0), OPT_SIZE_BOX("autofit-smaller", autofit_smaller, 0), - OPT_FLOATRANGE("window-scale", window_scale, 0, 0.001, 100), + OPT_DOUBLE("window-scale", window_scale, CONF_RANGE, .min = 0.001, .max = 100), OPT_FLAG("force-window-position", force_window_position, 0), OPT_STRING("x11-name", winname, 0), OPT_FLOATRANGE("monitoraspect", force_monitor_aspect, 0, 0.0, 9.0), diff --git a/options/options.h b/options/options.h index b0871a1d8f..b148a3dbdc 100644 --- a/options/options.h +++ b/options/options.h @@ -34,7 +34,7 @@ typedef struct mp_vo_opts { struct m_geometry autofit; struct m_geometry autofit_larger; struct m_geometry autofit_smaller; - float window_scale; + double window_scale; int keepaspect; int keepaspect_window; -- cgit v1.2.3