Reactivate gnome-screensaver and unclutter in the reverse order they are deactivated.

Conflicts:

	stuff/quake2-start.sh
This commit is contained in:
Christoph Mallon 2012-04-29 17:15:27 +02:00 committed by Yamagi Burmeister
parent d31e4a531d
commit 2b16d9eee8

View file

@ -24,14 +24,23 @@ ulimit -c unlimited
# run quake 2
./quake2 $*
<<<<<<< HEAD
# if gnome-screensaver was running..
if [ -n "$GSC_PID" ]; then
echo "reactivating gnome screensaver"
kill "$GSC_PID"
fi
=======
>>>>>>> f3edcfc... Reactivate gnome-screensaver and unclutter in the reverse order they are deactivated.
# Continue unclutter
if ps auxww | grep -q 'unclutter'; then
echo 'reactivating unclutter'
killall -CONT unclutter
fi
# if gnome-screensaver was running..
if [ $GSC_PID -gt 0 ]; then
echo "reactivating gnome screensaver"
kill $GSC_PID
fi