move opening display to readstdin(), so .Xresources can be read if
protocol is set to wayland but wayland isn't actually used
This commit is contained in:
parent
29365cd10e
commit
ceb86bed13
|
@ -64,6 +64,12 @@ void readargs(int argc, char *argv[]) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (protocol) {
|
||||||
|
if (connect_display(&state)) {
|
||||||
|
protocol = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// init/read xrdb
|
// init/read xrdb
|
||||||
if (xresources && !protocol) {
|
if (xresources && !protocol) {
|
||||||
#if USEXRESOURCES
|
#if USEXRESOURCES
|
||||||
|
|
6
spmenu.c
6
spmenu.c
|
@ -472,12 +472,6 @@ void handle(void) {
|
||||||
eventloop_x11(); // function is a loop which checks X11 events and calls other functions accordingly
|
eventloop_x11(); // function is a loop which checks X11 events and calls other functions accordingly
|
||||||
#if USEWAYLAND
|
#if USEWAYLAND
|
||||||
} else {
|
} else {
|
||||||
if (connect_display(&state)) {
|
|
||||||
protocol = 0;
|
|
||||||
handle();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
loadhistory();
|
loadhistory();
|
||||||
store_image_vars();
|
store_image_vars();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue