From a03a9bda4cc391e0714d0eeb9f2a4e1ba0af44a8 Mon Sep 17 00:00:00 2001
From: castro-fidel <tergoevm@gmail.com>
Date: Thu, 4 Nov 2021 16:30:13 +0300
Subject: [PATCH] Scripts version 2043

---
 data_from_portwine/changelog      |  6 +++++-
 data_from_portwine/scripts/runlib | 12 ++++++------
 data_from_portwine/scripts/var    |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog
index f886299b..a9b5386a 100755
--- a/data_from_portwine/changelog
+++ b/data_from_portwine/changelog
@@ -7,8 +7,12 @@
 * добавить проверку количества db файлов на один exe
 * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru
 -----------------------------------------
-###Scripts version 2041###
+###Scripts version 2043###
+* улучшена работа функции использования гибридной графики intel + nvidia 
+
+###Scripts version 2042###
 * из за проблемы на стороне githab перезалиты libs_v17.2
+* добавлена возможность удаления wine из графического интерфейса - Cпасибо Aldiserg (Dmitry)
 
 ###Scripts version 2041###
 * убран аргумент "-с" для функций скачивания (исправляет редкие проблемы со скачиванием на некоторых системах) 
diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index f4dd657f..19618851 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -204,7 +204,7 @@ start_portwine () {
     if [ -x "`which optimus-manager 2>/dev/null`" ]; then
         export check_optimus_manager=`optimus-manager --status | grep Current | cut -f 2 -d':' | sed -e 's/^[[:space:]]*//'`
     fi
-    if [[ ! -z "${PW_NVIDIA}" && "${check_optimus_manager}" != "intel" ]]; then
+    if [[ ! -z "${PW_NVIDIA}" && "${check_optimus_manager}" != "intel" ]] ; then
         if [ "${check_optimus_manager}" = "nvidia" ]; then
             export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json
         elif [ -x "`which primusrun 2>/dev/null`" ]; then
@@ -216,11 +216,10 @@ start_portwine () {
         elif [ -x "`which prime-run 2>/dev/null`" ]; then
             export optirun_on="prime-run"
             export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json
-        fi
-        export __NV_PRIME_RENDER_OFFLOAD=1
-        export __GLX_VENDOR_LIBRARY_NAME=nvidia
-        if [ ! -d "${PORT_WINE_TMP_PATH}"/gl_shader_cache ] ; then
-            mkdir -p "${PORT_WINE_TMP_PATH}"/gl_shader_cache
+        elif [[ -x "`which nvidia-settings 2>/dev/null`" ]] ; then 
+            export __NV_PRIME_RENDER_OFFLOAD=1
+            export __GLX_VENDOR_LIBRARY_NAME=nvidia
+            export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json
         fi
     else
         export DRI_PRIME=1
@@ -233,6 +232,7 @@ start_portwine () {
         export vblank_mode=1
         export __GL_SYNC_TO_VBLANK=1 ;;
     esac
+    create_new_dir "${PORT_WINE_TMP_PATH}"/gl_shader_cache
     export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk.conf"
     export int_xneur=0
     if [[ ! -z "`pgrep xneur`" ]]; then
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index bdfcb115..36cd66cd 100755
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -1,6 +1,6 @@
 #!/bin/bash
 #Author: Castro-Fidel (PortWINE-Linux.ru)
-#SCRIPTS_NEXT_VERSION=2042
+#SCRIPTS_NEXT_VERSION=2043
 #PORT_NEXT_VERSION=97
 ########################################################################
 export PW_MANGOHUD=0