From 348758658befe54fceb291f994d0bb65254454c5 Mon Sep 17 00:00:00 2001
From: Kron4ek <kron4ek@gmail.com>
Date: Sat, 3 Aug 2024 12:04:39 +0300
Subject: [PATCH] Fix Nvidia driver sharing when USE_OVERLAYFS is enabled

---
 conty-start.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/conty-start.sh b/conty-start.sh
index f1669fb..274476d 100755
--- a/conty-start.sh
+++ b/conty-start.sh
@@ -22,7 +22,7 @@ if (( EUID == 0 )) && [ -z "$ALLOW_ROOT" ]; then
 fi
 
 # Conty version
-script_version="1.26"
+script_version="1.26.1"
 
 # Important variables to manually adjust after modification!
 # Needed to avoid problems with mounting due to an incorrect offset.
@@ -1097,16 +1097,6 @@ if [ "$(ls "${mount_point}" 2>/dev/null)" ] || launch_wrapper "${mount_command[@
 		exit
 	fi
 
-	if [ "${USE_OVERLAYFS}" = 1 ]; then
-		if mount_overlayfs; then
-			show_msg "Using unionfs"
-			RW_ROOT=1
-		else
-			echo "Failed to mount unionfs"
-			unset USE_OVERLAYFS
-		fi
-	fi
-
 	if [ "${NVIDIA_HANDLER}" = 1 ]; then
 		if [ -f /sys/module/nvidia/version ]; then
 			unset NVIDIA_SHARED
@@ -1197,6 +1187,16 @@ if [ "$(ls "${mount_point}" 2>/dev/null)" ] || launch_wrapper "${mount_command[@
 		fi
 	fi
 
+	if [ "${USE_OVERLAYFS}" = 1 ]; then
+		if mount_overlayfs; then
+			show_msg "Using unionfs"
+			RW_ROOT=1
+		else
+			echo "Failed to mount unionfs"
+			unset USE_OVERLAYFS
+		fi
+	fi
+
 	# If SANDBOX_LEVEL is 3, run Xephyr and openbox before running applications
 	if [ "${SANDBOX}" = 1 ] && [ -n "${SANDBOX_LEVEL}" ] && [ "${SANDBOX_LEVEL}" -ge 3 ]; then
 		if [ -f "${mount_point}"/usr/bin/Xephyr ]; then