some changes

This commit is contained in:
speedie 2022-12-14 10:39:09 +01:00
parent 7f6d39d70c
commit 3129a1bdf8

View file

@ -6541,9 +6541,10 @@ main(int argc, char *argv[])
}
if (!(xcon = XGetXCBConnection(dpy)))
die("speedwm: Cannot get xcb connection\n");
if (!restart) autostart_exec();
checkotherwm();
XrmInitialize();
system("[ -e $HOME/.speedwmrc ] && xrdb -merge $HOME/.speedwmrc");
system("[ -e $HOME/.config/speedwm/speedwmrc ] && xrdb -merge $HOME/.config/speedwm/speedwmrc");
#if USEXRESOURCES
load_xresources();
#endif
@ -6554,7 +6555,9 @@ main(int argc, char *argv[])
#endif /* __OpenBSD__ */
scan();
run();
if (restart)
if (!restart)
autostart_exec();
else
execvp(argv[0], argv);
cleanup();
XCloseDisplay(dpy);