summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <devilhorns@comcast.net>2013-07-26 16:35:23 +0100
committerDeon Thomas <PrinceAMD.Elive@gmail.com>2013-07-29 18:00:33 -0400
commit4b5defdd2ca35198ae0c7af2ef284bf3f0b9a0d2 (patch)
treeef29640cffbd5be9c4a3762f174ba85b54c3e03f
parent3d26cd06e614dae3dea8a6296ff7fac0dc60627c (diff)
downloadenlightenment-4b5defdd2ca35198ae0c7af2ef284bf3f0b9a0d2.tar.gz
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 <devilhorns@comcast.net> Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
-rw-r--r--src/modules/conf_randr/e_smart_monitor.c8
1 files 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 723872cc8d..308cf92848 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);