summaryrefslogtreecommitdiff
path: root/st.c
diff options
context:
space:
mode:
authorAurélien Aptel <aurelien.aptel@gmail.com>2010-08-27 13:53:27 +0200
committerAurélien Aptel <aurelien.aptel@gmail.com>2010-08-27 13:53:27 +0200
commitc56332857145d1c6741d4f6c1bbc87dcc6c6ab97 (patch)
tree9d5b7f29d3ef637264b2bdfad0ec3fb1c0f8ee05 /st.c
parenta1018e0e9e52f29fe220a6af85a237a1a02a732c (diff)
removed XINERAMA from config.mk and fixed a segfault when st is
started without a display. (thx Hiltjo Posthuma)
Diffstat (limited to 'st.c')
-rw-r--r--st.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/st.c b/st.c
index 8dfd4a7..623ca29 100644
--- a/st.c
+++ b/st.c
@@ -1078,10 +1078,9 @@ xhints(void)
void
xinit(void) {
- xw.dis = XOpenDisplay(NULL);
- xw.scr = XDefaultScreen(xw.dis);
- if(!xw.dis)
+ if(!(xw.dis = XOpenDisplay(NULL)))
die("Can't open display\n");
+ xw.scr = XDefaultScreen(xw.dis);
/* font */
if(!(dc.font = XLoadQueryFont(xw.dis, FONT)) || !(dc.bfont = XLoadQueryFont(xw.dis, BOLDFONT)))