diff options
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/vmchooser')
| -rw-r--r-- | core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc index 5b58fbb9..d2685c15 100644 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc @@ -95,10 +95,12 @@ setup_virtual_floppy() { # Default to muted local MUTED=1 # Satellite/location setting can override - [ -n "$SLX_VM_MUTED" ] && [ "$SLX_VM_MUTED" -ge 0 ] && MUTED="$SLX_VM_MUTED" - # finally, lecture can override - if [ -n "${OPTIONS[SOUNDMUTED]}" ] && [ "${OPTIONS[SOUNDMUTED]}" != -1 ]; then - MUTED="${OPTIONS[SOUNDMUTED]}" + [[ "$SLX_VM_SOUND" = *_ACTIVE ]] && MUTED="0" + # finally, lecture override + if [[ "$SLX_VM_SOUND" != FORCE_* ]]; then + if [ -n "${OPTIONS[SOUNDMUTED]}" ] && [ "${OPTIONS[SOUNDMUTED]}" != -1 ]; then + MUTED="${OPTIONS[SOUNDMUTED]}" + fi fi # Write info file |