diff options
| author | Simon Rettberg | 2018-10-19 14:30:32 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2018-10-19 14:30:32 +0200 |
| commit | 40310a1c108b9cfc68c869160812c5ab9260cfba (patch) | |
| tree | 6e864b731f87445be805c133ba6767d50e93e992 /core/modules | |
| parent | [kernel-vanilla] Refine determining required aufs branch (diff) | |
| download | mltk-40310a1c108b9cfc68c869160812c5ab9260cfba.tar.gz mltk-40310a1c108b9cfc68c869160812c5ab9260cfba.tar.xz mltk-40310a1c108b9cfc68c869160812c5ab9260cfba.zip | |
[beamergui] Fix adding resolutions; more fallback options
Diffstat (limited to 'core/modules')
| -rwxr-xr-x | core/modules/beamergui/data/opt/openslx/scripts/beamergui-mode_setter | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/modules/beamergui/data/opt/openslx/scripts/beamergui-mode_setter b/core/modules/beamergui/data/opt/openslx/scripts/beamergui-mode_setter index fdc2416d..c957c20d 100755 --- a/core/modules/beamergui/data/opt/openslx/scripts/beamergui-mode_setter +++ b/core/modules/beamergui/data/opt/openslx/scripts/beamergui-mode_setter @@ -142,7 +142,6 @@ if [ ${#OUTPUTNAMES[@]} -eq 2 ]; then echo -e "Added mode ${i%% *} to $j." else echo -e "\e[31mFailed to add mode ${i%% *} to $j!\e[0m" - break fi done done @@ -202,9 +201,9 @@ if [ ${#OUTPUTNAMES[@]} -eq 2 ]; then # Maybe the screen has EDID, use its preferred resolution OPTIMALRES=$( <<<"$XRANDRV" grep -Pzo "\n$OTHER\N*\n(\s+\N*\n)+" \ | grep -m 1 -a preferred | awk '{print $1}' ) - for res in "$OPTIMALRES" "1280x800" "1280x720"; do + for res in "$OPTIMALRES" "1280x800" "1280x720" "1152x864" "1024x768"; do [ -z "$res" ] && continue - echo -e "\e[31mERROR: Beamer provides no EDID and no config found in $CONFIGFILE. Falling back to ${OPTIMALRES}.\e[0m" + echo -e "\e[31mERROR: Beamer provides no EDID and no config found in $CONFIGFILE. Falling back to ${res}.\e[0m" xrandr \ --output "$OTHER" --mode "$res" \ --primary \ |