Skip to content

Commit 0201b61

Browse files
committed
Fix error handling
1 parent fe982cd commit 0201b61

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

gui-daemon/xside.c

+5-4
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,8 @@ int x11_error_handler(Display * dpy, XErrorEvent * ev)
277277

278278
char error_msg[1024];
279279
XGetErrorText(ev->display, ev->error_code, error_msg, sizeof(error_msg));
280-
fprintf(stderr, "Encountered X Error:\n");
280+
int now = (int) time(NULL); // truncate
281+
fprintf(stderr, "[%d] Encountered X Error:\n", now);
281282
fprintf(stderr, error_msg);
282283

283284

@@ -402,7 +403,7 @@ static Window mkwindow(Ghandles * g, struct windowdata *vm_window)
402403
XISetMask(xi_mask.mask, XI_FocusOut);
403404

404405
int err = XISelectEvents(g->display, child_win, &xi_mask, 1);
405-
if (!err) {
406+
if (err) {
406407
fprintf(stderr, "Failed to subscribe to XI events. ErrCode: %d\n", err);
407408
exit(1);
408409
}
@@ -1941,9 +1942,9 @@ static void send_keymap_notify(Ghandles * g)
19411942
struct msg_hdr hdr;
19421943
char keys[32];
19431944
int err = XQueryKeymap(g->display, keys);
1944-
if (!err) {
1945+
if (err) {
19451946
fprintf(stderr, "XQueryKeymap failed: %d.\n", err);
1946-
exit(1);
1947+
return; // non fatal
19471948
}
19481949
hdr.type = MSG_KEYMAP_NOTIFY;
19491950
hdr.window = 0;

0 commit comments

Comments
 (0)