diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2013-06-20 02:33:58 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2013-06-20 02:33:58 +0000 |
| commit | 79b6fc556d2585f7a852bcdd1431f6bbf8552a00 (patch) | |
| tree | 0f52b965a45c6870604eff076b49b94d10f079b1 /app | |
| parent | 9f06fd16d7005155f650e502a53371179a5e9049 (diff) | |
when selfont is configured, make sure we continue and configure the rest
of the screen (quick fix); discovered the hard way by Rodrigo Mosconi.
Diffstat (limited to 'app')
| -rw-r--r-- | app/cwm/conf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/cwm/conf.c b/app/cwm/conf.c index 072969000..1c67ab088 100644 --- a/app/cwm/conf.c +++ b/app/cwm/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 <sys/param.h> @@ -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, |