CastroFidel/PortWINE
3
2
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Htylol-fixes-for-pw_find_exe' into devel

Browse Source
This commit is contained in:
Mikhail Tergoev 2024-09-30 18:46:02 +03:00
commit 8047c589f4
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data_from_portwine/scripts/functions_helper
View File

@ -1007,6 +1007,7 @@ init_wine_ver () {
} }
pw_init_runtime () { pw_init_runtime () {
check_flatpak && export PW_USE_RUNTIME="0"
if [[ "$PW_USE_RUNTIME" != "1" ]] \ if [[ "$PW_USE_RUNTIME" != "1" ]] \
|| [[ "$PW_WINE_USE" == "USE_SYSTEM_WINE" ]] || [[ "$PW_WINE_USE" == "USE_SYSTEM_WINE" ]]
then then

9
data_from_portwine/scripts/start.sh
View File

@ -284,7 +284,6 @@ fi
if check_flatpak ; then if check_flatpak ; then
try_remove_dir "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}" try_remove_dir "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}"
export PW_USE_RUNTIME="0"
else pw_download_libs else pw_download_libs
fi fi
@ -830,6 +829,14 @@ fi
else else
export TAB_MAIN_MENU="4" export TAB_MAIN_MENU="4"
fi fi
;;
pw_find_exe)
if [[ -z "${PW_ALL_DF}" ]] ; then
export TAB_MAIN_MENU="5"
else
export TAB_MAIN_MENU="1"
fi
;;
esac esac
[[ -n "$PW_YAD_SET" ]] && case "$PW_YAD_SET" in [[ -n "$PW_YAD_SET" ]] && case "$PW_YAD_SET" in