Revert "ES Shutdown/Restart Fix (#1308)"

This reverts commit 3ff2c96.
EmuELEC · Feb 16, 2024 · 3a824da · 3a824da
1 parent 3ff2c96
commit 3a824da
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/...onstation/config/scripts/combined/main.sh → ...onfig/scripts/combined/example.sh.example b/...onstation/config/scripts/combined/main.sh → ...onfig/scripts/combined/example.sh.example
@@ -30,18 +30,15 @@ event_start() {
     }
 
 event_game_start() {
-    echo "Started game rom: ${1} basename ${2} name ${3}"
+    echo "Started game rom: ${2} basename ${3} name ${4}"
     }
 
 event_screensaver_start() {
-    echo "Starting Screen saver ${1}"
+    echo "Starting Screen saver ${2}"
     }
 
 event_quit(){
-    case "${1}" in
-		"restart")
-		systemctl restart emustation
-		;;	
+    case "${2}" in
     "reboot")
     echo "Rebooting!"
     ;;
@@ -50,22 +47,21 @@ event_quit(){
     ;;
     *)
     echo "Just quitting!"
-		;;
-		esac
-}
+    }
+
 
 case "${EVENT}" in
     "start")
 	event_start
 	;;
     "game-start")
-	event_game_start ${1} ${2} ${3}
+	event_game_start ${2} ${3} ${4}
 	;;
     "screensaver-start")
-    event_screensaver_start ${1}
+    event_screensaver_start ${2}
 	;;
     "quit")
-    event_quit ${1} ${2} ${3}
+    event_quit ${2} ${3} ${4}
 	;;
     # and so and and so fort
     *)

diff --git a/packages/sx05re/emuelec-emulationstation/system.d/emustation.service b/packages/sx05re/emuelec-emulationstation/system.d/emustation.service
@@ -10,7 +10,7 @@ ExecStartPre=/usr/bin/killes.sh
 ExecStart=emulationstation
 KillMode=process
 TimeoutStopSec=3
-Restart=on-failure
+Restart=always
 RestartSec=2
 StartLimitInterval=0
 

diff --git a/packages/sx05re/emuelec/bin/ee_shutdown.sh b/packages/sx05re/emuelec/bin/ee_shutdown.sh
@@ -1,3 +1,7 @@
 #!/bin/bash
 
+systemctl stop emustation
+systemctl stop retroarch
+systemctl stop bluetooth
+sleep 5
 systemctl poweroff # --force