From f5014780e66bea2d30e3d7b9e161c0d76e29326f Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Tue, 16 Apr 2024 15:57:05 +0300
Subject: [PATCH] Scripts version 2280

---
 data_from_portwine/changelog_eng            |  3 +++
 data_from_portwine/changelog_rus            |  3 +++
 data_from_portwine/scripts/functions_helper | 10 ++++------
 data_from_portwine/scripts/lang             |  2 ++
 data_from_portwine/scripts/var              |  2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng
index 52d71d42..63c99e80 100755
--- a/data_from_portwine/changelog_eng
+++ b/data_from_portwine/changelog_eng
@@ -2,6 +2,9 @@ You can help us in the development of the project on the website: https://linux-
 ----------------------------------------
 Changelog:
 
+###Scripts version 2280### Date: 16.04.2024 / Download update size: 15 megabytes
+* minor fixes for SteamDeck + flatpak
+
 ###Scripts version 2279### Date: 16.04.2024 / Download update size: 15 megabytes
 * improvements to the flatpak version of PortProton:
     - fixed running games on SteamDeck in gaming mode
diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus
index 49df9dba..424a574f 100755
--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@@ -2,6 +2,9 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2280### Дата: 16.04.2024 / Размер скачиваемого обновления: 15 мегабайт
+* небольшие исправления для SteamDeck + flatpak
+
 ###Scripts version 2279### Дата: 16.04.2024 / Размер скачиваемого обновления: 15 мегабайт
 * улучшения flatpak версии PortProton:
     - исправлен запуск игр на SteamDeck в игровом режиме
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index b65ef50a..0671c70e 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -266,7 +266,7 @@ check_flatpak () {
         return 1
     fi
 }
-
+export -f check_flatpak
 
 unpack_tar_zst () {
     set -o pipefail
@@ -525,10 +525,7 @@ pw_init_runtime () {
     else export PATH="${PW_PLUGINS_PATH}/portable/bin"
     fi
 
-    if check_flatpak ; then
-        [[ "${update_loc}" == "RUS" ]] && export LC_ALL=ru_RU.UTF-8
-        export PW_USE_RUNTIME="0"
-    fi
+    check_flatpak && export PW_USE_RUNTIME="0"
 
     if [[ "$PW_USE_RUNTIME" != "1" ]] \
     || [[ "$PW_WINE_USE" == "USE_SYSTEM_WINE" ]]
@@ -2997,8 +2994,9 @@ gui_MangoHud () {
 }
 
 portwine_create_shortcut () {
-    pw_create_gui_png
     pw_stop_progress_bar
+    [[ ! -e ${portwine_exe} ]] && return 1
+    pw_create_gui_png
 
     if [[ "$1" == "block_name" ]] ; then
         export name_desktop="${PORTPROTON_NAME}"
diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang
index f499a01f..effbec27 100755
--- a/data_from_portwine/scripts/lang
+++ b/data_from_portwine/scripts/lang
@@ -28,6 +28,8 @@ else
 fi
 
 if [[ "${update_loc}" == "RUS" ]] ; then
+	check_flatpak && export LC_LANG=ru_RU.UTF-8
+
 	export loc_gui_pw_reinstall_pp="Переустановить PortProton"
     export loc_gui_rm_pp="Удалить PortProton"
     export loc_gui_upd_pp="Проверить обновления"
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index 91bac2c3..df46d5e4 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=2279
+#SCRIPTS_NEXT_VERSION=2280
 ########################################################################
 export PW_MANGOHUD="0"
 export DEFAULT_MANGOHUD_CONFIG="arch,cpu_mhz,cpu_temp,engine_version,gamemode,gpu_core_clock,gpu_mem_clock,gpu_name,gpu_temp,ram,resolution,vkbasalt,vram,vulkan_driver,wine"