Ticket #3401: noxrandr.1.patch

libs/libmyth/DisplayResX.cpp

@@ -52 +52 @@
                                               desired_screen, rate);
     if (idx >= 0)
     {
-        Display *display = NULL;
-        XRRScreenConfiguration *cfg = GetScreenConfig(display);
+        Display *display = MythXOpenDisplay();
+        if (!display)
+            return false;
+        XRRScreenConfiguration *cfg = NULL;
+        if (XRRQueryExtension(display,NULL,NULL))
+            cfg = GetScreenConfig(display);
         if (!cfg)
             return false;
 
@@ -82 +86 @@
     if (m_video_modes.size())
         return m_video_modes;
 
-    Display *display = NULL;
-    XRRScreenConfiguration *cfg = GetScreenConfig(display);
+    Display *display = MythXOpenDisplay();
+    if (!display)
+        return m_video_modes;
+    XRRScreenConfiguration *cfg = NULL;
+    if (XRRQueryExtension(display,NULL,NULL))
+        cfg = GetScreenConfig(display);
     if (!cfg)
         return m_video_modes;
 
@@ -121 +129 @@
 
     X11L;
     Window root = RootWindow(display, DefaultScreen(display));
-    XRRScreenConfiguration *cfg = XRRGetScreenInfo(display, root);
+    XRRScreenConfiguration *cfg = NULL;
+    if (XRRQueryExtension(display,NULL,NULL))
+        cfg = XRRGetScreenInfo(display, root);
     if (!cfg)
     {
         if (display)