Updating branch refs/heads/bluesabre/display-settings
to 430b46f6c5ed382fb1a2560efb6bdd291011b169 (commit)
from a2a700d8b8a34a9f2d88ba8d5266bf2590373f11 (commit)
commit 430b46f6c5ed382fb1a2560efb6bdd291011b169
Author: Simon Steinbeiss <simon.steinbe...@elfenbeinturm.at>
Date: Mon Oct 22 10:34:06 2012 +0200
Fix crash when using dualhead with separate xscreens (Bug #9389)
xfsettingsd/displays.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index 9f01694..3d5e0f0 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -488,7 +488,7 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
&min_width, &min_height, &max_width,
&max_height))
{
g_critical ("Unable to get the range of screen sizes, aborting.");
- goto err_cleanup;
+ goto err_abort;
}
/* get all existing CRTCs */
@@ -818,6 +818,7 @@ err_cleanup:
}
g_free (crtcs);
+err_abort:
/* free the screen resources */
XRRFreeScreenResources (resources);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
