From 8800c3b406b7ab61e3c77b72c44e8735e05293d4 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 12 Nov 2012 13:52:38 +0000 Subject: [PATCH] fix some possible round issues in screensaver config SVN revision: 79160 --- src/modules/conf_display/e_int_config_screensaver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/conf_display/e_int_config_screensaver.c b/src/modules/conf_display/e_int_config_screensaver.c index 22b6d2a72..3c2587c03 100644 --- a/src/modules/conf_display/e_int_config_screensaver.c +++ b/src/modules/conf_display/e_int_config_screensaver.c @@ -65,7 +65,7 @@ static void _fill_data(E_Config_Dialog_Data *cfdata) { cfdata->enable_screensaver = e_config->screensaver_enable; - cfdata->timeout = e_config->screensaver_timeout / 60; + cfdata->timeout = (double)e_config->screensaver_timeout / 60.; cfdata->ask_presentation = e_config->screensaver_ask_presentation; cfdata->presentation_mode = e_config->mode.presentation; cfdata->ask_presentation_timeout = e_config->screensaver_ask_presentation_timeout; @@ -96,7 +96,7 @@ static int _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { e_config->screensaver_enable = cfdata->enable_screensaver; - e_config->screensaver_timeout = (cfdata->timeout * 60); + e_config->screensaver_timeout = lround(cfdata->timeout * 60); e_config->screensaver_ask_presentation = cfdata->ask_presentation; e_config->mode.presentation = cfdata->presentation_mode; e_config->screensaver_ask_presentation_timeout = cfdata->ask_presentation_timeout; @@ -128,7 +128,7 @@ static int _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { return ((e_config->screensaver_enable != cfdata->enable_screensaver) || - (e_config->screensaver_timeout != (int)(cfdata->timeout * 60)) || + (e_config->screensaver_timeout != lround(cfdata->timeout * 60)) || (e_config->screensaver_ask_presentation != cfdata->ask_presentation) || (e_config->mode.presentation != cfdata->presentation_mode) || (e_config->screensaver_ask_presentation_timeout != cfdata->ask_presentation_timeout) ||