From 78d64ad2a72f3c7d49200dce3c0318d76df24d60 Mon Sep 17 00:00:00 2001
From: AnErrupTion <anerruption@disroot.org>
Date: Thu, 6 Mar 2025 20:06:28 +0100
Subject: [PATCH] Possibly fix .Xresources not being loaded (closes #600)

Signed-off-by: AnErrupTion <anerruption@disroot.org>
---
 res/setup.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/setup.sh b/res/setup.sh
index 549994a..8ec0f00 100755
--- a/res/setup.sh
+++ b/res/setup.sh
@@ -89,6 +89,10 @@ if [ "$XDG_SESSION_TYPE" = "x11" ]; then
         done
     fi
 
+    if [ -f "$USERXSESSION" ]; then
+        . "$USERXSESSION"
+    fi
+
     if [ -d "$CONFIG_DIRECTORY"/X11/Xresources ]; then
         for i in "$CONFIG_DIRECTORY"/X11/Xresources/*; do
             [ -f "$i" ] && xrdb -merge "$i"
@@ -98,10 +102,6 @@ if [ "$XDG_SESSION_TYPE" = "x11" ]; then
     fi
     [ -f "$HOME"/.Xresources ] && xrdb -merge "$HOME"/.Xresources
     [ -f "$XDG_CONFIG_HOME"/X11/Xresources ] && xrdb -merge "$XDG_CONFIG_HOME"/X11/Xresources
-
-    if [ -f "$USERXSESSION" ]; then
-        . "$USERXSESSION"
-    fi
 fi
 
 exec "$@"