diff options
| author | Aurélien Aptel <aurelien.aptel@gmail.com> | 2010-08-27 13:53:27 +0200 |
|---|---|---|
| committer | Aurélien Aptel <aurelien.aptel@gmail.com> | 2010-08-27 13:53:27 +0200 |
| commit | c56332857145d1c6741d4f6c1bbc87dcc6c6ab97 (patch) | |
| tree | 9d5b7f29d3ef637264b2bdfad0ec3fb1c0f8ee05 /st.c | |
| parent | fixed potential bug in IS_SET(). (diff) | |
| download | st-c56332857145d1c6741d4f6c1bbc87dcc6c6ab97.tar.gz st-c56332857145d1c6741d4f6c1bbc87dcc6c6ab97.zip | |
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.c | 5 |
1 files changed, 2 insertions, 3 deletions
| @@ -1078,10 +1078,9 @@ xhints(void) | |||
| 1078 | 1078 | ||
| 1079 | void | 1079 | void |
| 1080 | xinit(void) { | 1080 | xinit(void) { |
| 1081 | xw.dis = XOpenDisplay(NULL); | 1081 | if(!(xw.dis = XOpenDisplay(NULL))) |
| 1082 | xw.scr = XDefaultScreen(xw.dis); | ||
| 1083 | if(!xw.dis) | ||
| 1084 | die("Can't open display\n"); | 1082 | die("Can't open display\n"); |
| 1083 | xw.scr = XDefaultScreen(xw.dis); | ||
| 1085 | 1084 | ||
| 1086 | /* font */ | 1085 | /* font */ |
| 1087 | if(!(dc.font = XLoadQueryFont(xw.dis, FONT)) || !(dc.bfont = XLoadQueryFont(xw.dis, BOLDFONT))) | 1086 | if(!(dc.font = XLoadQueryFont(xw.dis, FONT)) || !(dc.bfont = XLoadQueryFont(xw.dis, BOLDFONT))) |
