From f20ad2344eeb70e621658f92e9fc2d0e2d57118c Mon Sep 17 00:00:00 2001
From: Etaash Mathamsetty <etaash.mathamsetty@gmail.com>
Date: Fri, 11 Oct 2024 22:12:27 -0400
Subject: [PATCH] Fix find_nv_x11 logging

---
 src/nvidia.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/nvidia.cpp b/src/nvidia.cpp
index 5bca5949c3..7cbc42ecf6 100644
--- a/src/nvidia.cpp
+++ b/src/nvidia.cpp
@@ -280,17 +280,19 @@ char* NVIDIA::get_attr_target_string(libnvctrl_loader& nvctrl, int attr, int tar
 #if defined(HAVE_XNVCTRL) && defined(HAVE_X11)
 bool NVIDIA::find_nv_x11(libnvctrl_loader& nvctrl, Display*& dpy)
 {
-    char buf[8] {};
+    const char *display = getenv("DISPLAY");
     auto libx11 = get_libx11();
-    Display *d = libx11->XOpenDisplay(getenv("DISPLAY"));
-    if (d) {
-        int s = libx11->XDefaultScreen(d);
-        if (nvctrl.XNVCTRLIsNvScreen(d, s)) {
-            dpy = d;
-            SPDLOG_DEBUG("XNVCtrl is using display {}", buf);
-            return true;
+    if(display) {
+        Display *d = libx11->XOpenDisplay(display);
+        if (d) {
+            int s = libx11->XDefaultScreen(d);
+            if (nvctrl.XNVCTRLIsNvScreen(d, s)) {
+                dpy = d;
+                SPDLOG_DEBUG("XNVCtrl is using display {}", display);
+                return true;
+            }
+            libx11->XCloseDisplay(d);
         }
-        libx11->XCloseDisplay(d);
     }
     return false;
 }