Skip to content

FScreen: fix crash on transient empty RandR topology (lid reopen) #1337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gtnoble wants to merge 1 commit into from
+23 −7
Closed

FScreen: fix crash on transient empty RandR topology (lid reopen) #1337

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions libs/FScreen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,8 @@ monitor_check_primary(void)
struct monitor *m;

m = RB_MIN(monitors, &monitor_q);
m->flags |= MONITOR_PRIMARY;
if (m != NULL)
m->flags |= MONITOR_PRIMARY;
}
}

Expand Down Expand Up @@ -562,9 +563,21 @@ scan_screens(Display *dpy)
}

rrm = XRRGetMonitors(dpy, root, true, &n);
if (n <= 0 && (!randr_initialised && monitor_get_count() == 0)) {
fvwm_debug(__func__, "get monitors failed\n");
exit(101);
if (n <= 0) {
if (!randr_initialised && monitor_get_count() == 0) {
fvwm_debug(__func__, "get monitors failed\n");
exit(101);
}
/* Transient empty topology (e.g. a monitor has been
* disabled but not yet re-enabled, as happens when a
* laptop lid is reopened). Retain the existing monitor
* set and wait for the next RandR event.
*/
fvwm_debug(__func__,
"no monitors reported; retaining current set\n");
if (rrm != NULL)
XRRFreeMonitors(rrm);
return;
}

/*
Expand Down Expand Up @@ -891,10 +904,13 @@ FindScreenOfXY(int x, int y)
}
}

/* Shouldn't happen. */
/* Shouldn't happen. If it does (e.g. all monitors transiently
* disabled), degrade gracefully rather than killing the WM.
*/
if (m_min == NULL) {
fvwm_debug(__func__, "Couldn't find any monitor");
exit(106);
fvwm_debug(__func__,
"Couldn't find any monitor; using global");
return (monitor_get_global());
}
return (m_min);
}
Expand Down
Loading