Skip to content
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

Jump to bottom

ensure_unlocked_desktop: Fix blackscreen case in GNOME laptop #6121

Merged
merged 1 commit into from
Nov 6, 2018
Merged

ensure_unlocked_desktop: Fix blackscreen case in GNOME laptop #6121

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 4 additions & 9 deletions lib/utils.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,16 +475,11 @@ sub ensure_unlocked_desktop {
last; # desktop is unlocked, mission accomplished
}
if (match_has_tag 'screenlock') {
unless (get_var('DESKTOP', '') =~ m/gnome/ && check_screen('blackscreen')) {
# Only xscreensaver has a blackscreen as screenlock but gnome might
# show a black screen here as a transient screen due to switch to x11.
# Pressing 'esc' in this case will break the user selection by pressing 'ret'.
wait_screen_change {
send_key 'esc'; # end screenlock
};
}
wait_screen_change {
send_key 'esc'; # end screenlock
};
}
wait_still_screen 2; # slow down loop
wait_still_screen 2; # slow down loop
die 'ensure_unlocked_desktop repeated too much. Check for X-server crash.' if ($counter eq 1); # die loop when generic-desktop not matched
}
}
Expand Down