devilhorns pushed a commit to branch master.
commit 7f6285d9fd3359c0ead3cb079e7f01da6400fd19
Author: Chris Michael <[email protected]>
Date: Fri Jul 26 16:35:23 2013 +0100
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 <[email protected]>
---
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 c2f6032..8814fbf 100644
--- a/src/modules/conf_randr/e_smart_monitor.c
+++ b/src/modules/conf_randr/e_smart_monitor.c
@@ -792,10 +792,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 */
@@ -859,7 +856,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);
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
