mirror of
https://github.com/yquake2/yquake2remaster.git
synced 2024-11-10 07:12:07 +00:00
Reactivate gnome-screensaver and unclutter in the reverse order they are deactivated.
Conflicts: stuff/quake2-start.sh
This commit is contained in:
parent
d31e4a531d
commit
2b16d9eee8
1 changed files with 9 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue