From d7d2522e22e8591ff94010b3139a4b3ad6d568d9 Mon Sep 17 00:00:00 2001 From: okan Date: Thu, 20 Jun 2013 02:33:57 +0000 Subject: when selfont is configured, make sure we continue and configure the rest of the screen (quick fix); discovered the hard way by Rodrigo Mosconi. --- conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf.c b/conf.c index 0729690..1c67ab0 100644 --- a/conf.c +++ b/conf.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: conf.c,v 1.135 2013/06/17 17:11:10 okan Exp $ + * $OpenBSD: conf.c,v 1.136 2013/06/20 02:33:57 okan Exp $ */ #include @@ -121,7 +121,7 @@ conf_screen(struct screen_ctx *sc) } } if (i == CWM_COLOR_MAX) - return; + goto out; xu_xorcolor(sc->xftcolor[CWM_COLOR_MENU_BG], sc->xftcolor[CWM_COLOR_MENU_FG], &xc); @@ -129,7 +129,7 @@ conf_screen(struct screen_ctx *sc) if (!XftColorAllocValue(X_Dpy, sc->visual, sc->colormap, &xc.color, &sc->xftcolor[CWM_COLOR_MENU_FONT_SEL])) warnx("XftColorAllocValue: '%s'", Conf.color[i]); - +out: sc->menuwin = XCreateSimpleWindow(X_Dpy, sc->rootwin, 0, 0, 1, 1, Conf.bwidth, sc->xftcolor[CWM_COLOR_MENU_FG].pixel, -- cgit v1.2.3-2-gb3c3