From 7d7ef7496a33d6134315aeb2b4c8e33b10572b54 Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Sun, 29 Sep 2024 18:17:18 +0300
Subject: [PATCH] Scripts version 2357

---
 data_from_portwine/changelog_en             | 12 ++++++++++++
 data_from_portwine/changelog_ru             |  2 ++
 data_from_portwine/scripts/functions_helper |  1 +
 data_from_portwine/scripts/start.sh         |  2 +-
 data_from_portwine/scripts/var              |  2 +-
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en
index 51a262f..19aa976 100755
--- a/data_from_portwine/changelog_en
+++ b/data_from_portwine/changelog_en
@@ -2,6 +2,18 @@ You can help us in the development of the project on the website: https://linux-
 ----------------------------------------
 Changelog:
 
+###Scripts version 2357### / Date: 29.09.2024 / Download update size: 220 megabytes
+* updated PROTON_LG to version "9-15"
+* updated versions:
+    * DXVK_GIT "2.4.1-74"
+    * VKD3D_GIT "1.1-4202"
+* added auto-installation "Star Conflict" (thanks to Chal55rus)
+* added auto-installation "Blood and Soul" (thanks to Chal55rus)
+* updated auto-installation "World of Sea Battle" (thanks valokardin)
+* for "World of Sea Battle" language switching in the game has been fixed and the "DOTNET" prefix is ​​no longer required
+* fixed determination of the selection of settings files when the exe file is a symbolic link
+* added returns to the main menu after canceling the reinstallation/uninstallation of PP, clearing the prefix and uninstalling programs (thanks to Htylol)
+
 ###Scripts version 2356### / stable / Date: 28.09.2024 / Download update size: 4 megabytes
 * fixed work in steam and ingame
 
diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru
index 23c55ea..e875dbc 100755
--- a/data_from_portwine/changelog_ru
+++ b/data_from_portwine/changelog_ru
@@ -2,6 +2,7 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2357### / Дата: 29.09.2024 / Размер скачиваемого обновления: 220 мегабайт
 * обновлен PROTON_LG до версии "9-15"
 * обновлены версии:
     * DXVK_GIT "2.4.1-74"
@@ -11,6 +12,7 @@
 * обновлена автоустановка "World of Sea Battle" (спасибо valokardin)
 * для "World of Sea Battle" исправлено переключение языка в игре и больше не требуется префикс "DOTNET"
 * исправлено определение выбора файлов настроек когда exe файл является символьной ссылкой
+* добавлены возвраты в основное меню после отмены переустановки/удалении PP, чистки префикса и удаления программ (спасибо Htylol)
 
 ###Scripts version 2356### / stable / Дата: 28.09.2024 / Размер скачиваемого обновления: 4 мегабайт
 * исправлена работа в steam и ingame
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 0dde9b6..1a8b32a 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -681,6 +681,7 @@ background_pid () {
     local arg3=$3 # Номер процесса (1,2,3..)
 
     if [[ "$START_FROM_STEAM" == 1 ]] \
+    || [[ "$PW_GUI_DISABLED_CS" == 1 ]] \
     || [[ -n "$PW_DEBUG" ]] ; then
         case $arg1 in
             --start) eval "$arg2" ;;
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index 477d815..3267b0e 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -742,7 +742,7 @@ else
     --field="   Farlight 84"!"$PW_GUI_ICON_PATH/farlight84.png"!"":"FBTN" '@bash -c "button_click --normal PW_FARLIGHT84"' \
     --field="   Secret World Legends (ENG)"!"$PW_GUI_ICON_PATH/swl.png"!"":"FBTN" '@bash -c "button_click --normal PW_SWL"' \
     --field="   Blood and Soul"!"$PW_GUI_ICON_PATH/bloodandsoul.png"!"":"FBTN" '@bash -c "button_click --normal PW_BLOOD_AND_SOUL"' \
-    --field="   Star Conflict (ENG)"!"$PW_GUI_ICON_PATH/starconflict.png"!"":"FBTN" '@bash -c "button_click --normal PW_STAR_CONFLICT"' \
+    --field="   Star Conflict"!"$PW_GUI_ICON_PATH/starconflict.png"!"":"FBTN" '@bash -c "button_click --normal PW_STAR_CONFLICT"' \
     2>/dev/null &
 
     export START_FROM_PP_GUI="1"
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index e84bf58..5647428 100755
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #Author: Castro-Fidel (linux-gaming.ru)
-#SCRIPTS_NEXT_VERSION=2356
+#SCRIPTS_NEXT_VERSION=2357
 #SCRIPTS_STABLE_VERSION=2356
 ########################################################################
 # export PROTON_USE_XALIA="1"