diff options
| author | Britney Fransen <brfransen@gmail.com> | 2012-05-16 16:18:34 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2012-05-16 16:18:34 (GMT) |
| commit | 71cfd1ae3aeeb1989869a0d8e948340602ef1c8e (patch) | |
| tree | d92ecb2affdae51e0c3dde00eb656c8a5db0e62e /abs/core/LinHES-system/LinHES-session | |
| parent | feb3eb587bc14cc4415aecdbe0d39feb86e0bb9d (diff) | |
| parent | d11edcfd208c6ee48819b565c9dbd620e9c83781 (diff) | |
| download | linhes_pkgbuild-71cfd1ae3aeeb1989869a0d8e948340602ef1c8e.zip linhes_pkgbuild-71cfd1ae3aeeb1989869a0d8e948340602ef1c8e.tar.gz linhes_pkgbuild-71cfd1ae3aeeb1989869a0d8e948340602ef1c8e.tar.bz2 | |
Merge branch 'testing' of linhes.org:linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/LinHES-system/LinHES-session')
| -rwxr-xr-x | abs/core/LinHES-system/LinHES-session | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session index f01e569..918406d 100755 --- a/abs/core/LinHES-system/LinHES-session +++ b/abs/core/LinHES-system/LinHES-session @@ -345,35 +345,34 @@ function set_background() if [ x$WM = "x" ] then - fluxbox > /var/log/fluxbox.log 2>&1 - -else - #if using mythvantage style, start the WM right away - # this is done so that starting mythtv can loop. - $WM & - pid=$! - mouse_move - keylaunch - set_background - unclutter - load_nvidia_settings - run_tilda - start_screensaver - show_help_tip - notify_scan & - update_apple_trailers - - first_configure - start_myth - - # wait for the windowmanger - #This will make the session wait on the WM to exit. - if [ x$STARTUP_STYLE != xmythvantage ] - then - wait $pid - fi +# fluxbox > /var/log/fluxbox.log 2>&1 + WM=fluxbox +fi +#if using mythvantage style, start the WM right away +# this is done so that starting mythtv can loop. +$WM & +pid=$! +mouse_move +keylaunch +set_background +unclutter +load_nvidia_settings +run_tilda +start_screensaver +show_help_tip +notify_scan & +update_apple_trailers +first_configure +start_myth + +# wait for the windowmanger +#This will make the session wait on the WM to exit. +if [ x$STARTUP_STYLE != xmythvantage ] +then + wait $pid fi + |