From 4b5defdd2ca35198ae0c7af2ef284bf3f0b9a0d2 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Fri, 26 Jul 2013 16:35:23 +0100 Subject: [PATCH] Backport: 5fecc20 :: When we are re-enabling a monitor, do not free the mode info from the smart data's list of modes. This will get freed when the dialog closes. Fix some formatting for 80 columns. NB: Should fix etrunko crash ;) Signed-off-by: Chris Michael Signed-off-by: Deon Thomas --- src/modules/conf_randr/e_smart_monitor.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/modules/conf_randr/e_smart_monitor.c b/src/modules/conf_randr/e_smart_monitor.c index 723872cc8..308cf9284 100644 --- a/src/modules/conf_randr/e_smart_monitor.c +++ b/src/modules/conf_randr/e_smart_monitor.c @@ -776,10 +776,7 @@ e_smart_monitor_changes_apply(Evas_Object *obj) info = _e_smart_monitor_mode_find(sd, sd->current.w, sd->current.h, EINA_FALSE); if (info) - { - sd->current.mode = info->xid; - ecore_x_randr_mode_info_free(info); - } + sd->current.mode = info->xid; } /* if this monitor gets re-enabled, we need to assign a crtc */ @@ -843,7 +840,8 @@ e_smart_monitor_changes_apply(Evas_Object *obj) sd->crtc.orient = orient; sd->crtc.enabled = sd->current.enabled; - if ((sd->crtc.mode) && (mode_info = ecore_x_randr_mode_info_get(root, sd->crtc.mode))) + if ((sd->crtc.mode) && + (mode_info = ecore_x_randr_mode_info_get(root, sd->crtc.mode))) { sd->crtc.refresh_rate = _e_smart_monitor_mode_refresh_rate_get(mode_info);