Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix lockups entering apps or games #1369

Merged
merged 4 commits into from
Jan 23, 2024
Merged

Fix lockups entering apps or games #1369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b5409f
Various
XK9274 Jan 13, 2024
2386c20
Set TZ in BLF script
XK9274 Jan 13, 2024
9aecdd6
Merge branch 'main' into fix-lockups-tz-related
Aemiii91 Jan 23, 2024
d630f87
Merge branch 'main' into fix-lockups-tz-related
Aemiii91 Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 4 additions & 12 deletions static/build/.tmp_update/runtime.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ change_resolution() {
launch_game() {
log "\n:: Launch game"
cmd=$(cat $sysdir/cmd_to_run.sh)
TZ_VALUE=$(cat "$sysdir/config/.tz")

is_game=0
rompath=""
Expand Down Expand Up @@ -384,7 +385,9 @@ launch_game() {

# GAME LAUNCH
cd /mnt/SDCARD/RetroArch/
$sysdir/cmd_to_run.sh

# make the cmd_to_run shell env aware of the new timezone
TZ="$TZ_VALUE" $sysdir/cmd_to_run.sh
retval=$?

if [ -f /tmp/new_res_available ]; then
Expand Down Expand Up @@ -796,23 +799,12 @@ start_networking() {
}

check_networking() {
if [ $DEVICE_ID -ne $MODEL_MMP ] || [ ! -f /tmp/network_changed ] && [ -f /tmp/ntp_synced ]; then
check_timezone
return
fi

if pgrep -f update_networking.sh; then
log "update_networking already running"
else
rm /tmp/network_changed
$sysdir/script/network/update_networking.sh check
fi

check_timezone
}

check_timezone() {
export TZ=$(cat "$sysdir/config/.tz")
}

check_installer() {
Expand Down
2 changes: 2 additions & 0 deletions static/build/.tmp_update/script/blue_light.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ if [ -f "$lockfile" ]; then
exit 1
fi

export TZ=$(cat "$sysdir/config/.tz")

touch "$lockfile"
trap 'rm -f "$lockfile"; exit' INT TERM EXIT

Expand Down