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

Fixed a bug when PW_COMMENT_DB was saved from a ppdb file and overridden files without it

Browse Source
This commit is contained in:
Htylol 2024-09-13 05:42:17 +05:00
parent 5b34472013
commit 07b3406d0d
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data_from_portwine/scripts/functions_helper
View File

@ -440,10 +440,10 @@ pw_notify_send () {
local OPTIND="1"
while getopts a:i:t: opt ; do
case "$opt" in
a)
a)
local app=$OPTARG
;;
i)
i)
case "$OPTARG" in
info) local OPTARG="${PORT_WINE_PATH}/data/img/gui/notify_info.svg";;
warning) local OPTARG="${PORT_WINE_PATH}/data/img/gui/notify_warning.svg";;
@ -451,10 +451,10 @@ pw_notify_send () {
esac
local icon=$OPTARG
;;
t)
t)
local timeout=$OPTARG
;;
*)
*)
echo "usage: $0
[-a] name application (PortProton default)
[-i] info, warning, error (none default)
@ -1455,7 +1455,7 @@ pw_init_db () {
PORTWINE_DB_FILE="${PW_FIND_DB_FILE}"
fi
IFS="$orig_IFS"
if [[ -f "${PW_FIND_DB_FILE}" ]] ; then
# shellcheck source=/dev/null
source "${PORTWINE_DB_FILE}"
@ -3454,7 +3454,7 @@ pw_tray_icon () {
$(gettext "WINEFILE")!bash -c pw_tray_winefile!"$PW_GUI_ICON_PATH/wine_file.svg"|| \
$(gettext "TASKMGR")!bash -c pw_tray_taskmgr!"$PW_GUI_ICON_PATH/wine_system.svg"|| \
$(gettext "CHANGELOG")!bash -c open_changelog!"$PW_GUI_ICON_PATH/history.svg"|| \
$(gettext "FORCE EXIT") !bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/close.svg"||" 2>/dev/null &
$(gettext "FORCE EXIT")!bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/close.svg"||" 2>/dev/null &
else
PW_GUI_TRAY_PATH="${PW_GUI_THEMES_PATH}/tray"
env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${PW_GUI_TRAY_PATH}/tray_gui_pp" &

13
data_from_portwine/scripts/start.sh
View File

@ -98,7 +98,7 @@ unset CHK_SYMLINK_FILE PW_MESA_GL_VERSION_OVERRIDE PW_VKD3D_FEATURE_LEVEL PATH_T
unset PW_PREFIX_NAME WINEPREFIX VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR AMD_VULKAN_ICD PW_WINE_CPU_TOPOLOGY
unset PW_NAME_D_NAME PW_NAME_D_ICON PW_NAME_D_EXEC PW_EXEC_FROM_DESKTOP PW_ALL_DF PW_GENERATE_BUTTONS PW_NAME_D_ICON PW_NAME_D_ICON_48
unset MANGOHUD_CONFIG FPS_LIMIT PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER WINESERVER PW_USE_RUNTIME PORTWINE_CREATE_SHORTCUT_NAME MIRROR
unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR RADV_DEBUG
unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR RADV_DEBUG PW_COMMENT_DB
export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
rm -f "$PORT_WINE_TMP_PATH"/*{exe,msi,tar}*
@ -540,11 +540,12 @@ case "${PW_VULKAN_USE}" in
*) PW_DEFAULT_VULKAN_USE="$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_G_ZINK!$SORT_G_NINE!$SORT_OPENGL!$SORT_VULKAN" ;;
esac
if [[ -n "${PW_COMMENT_DB}" ]] ; then :
elif [[ -n "${PORTPROTON_NAME}" ]] ; then
PW_COMMENT_DB="$(gettext "Launching") <b>${PORTPROTON_NAME}</b>"
else
PW_COMMENT_DB="$(gettext "Launching") <b>${PORTWINE_DB}</b>"
if [[ -z "${PW_COMMENT_DB}" ]] ; then
if [[ -n "${PORTPROTON_NAME}" ]] ; then
PW_COMMENT_DB="$(gettext "Launching") <b>${PORTPROTON_NAME}</b>"
else
PW_COMMENT_DB="$(gettext "Launching") <b>${PORTWINE_DB}</b>"
fi
fi
if [[ $PW_WINE_USE == PROTON_LG ]] ; then