MythXDisplay: Store the display string in use

MythTV · Oct 15, 2019 · 5f3db62 · 5f3db62
1 parent 76bca2a
commit 5f3db62
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/mythtv/libs/libmythui/mythxdisplay.cpp b/mythtv/libs/libmythui/mythxdisplay.cpp
@@ -87,10 +87,10 @@ bool MythXDisplay::Open(void)
 {
     MythXLocker locker(this);
 
-    QString dispStr = MythUIHelper::GetX11Display();
+    m_displayName = MythUIHelper::GetX11Display();
     const char *dispCStr = nullptr;
-    if (!dispStr.isEmpty())
-        dispCStr = dispStr.toLatin1().constData();
+    if (!m_displayName.isEmpty())
+        dispCStr = m_displayName.toLatin1().constData();
 
     m_disp = XOpenDisplay(dispCStr);
     if (!m_disp)

diff --git a/mythtv/libs/libmythui/mythxdisplay.h b/mythtv/libs/libmythui/mythxdisplay.h
@@ -3,6 +3,7 @@
 #ifndef _MYTHXDISPLAY_X_
 #define _MYTHXDISPLAY_X_
 
+#include <QString>
 #include <QMutex>
 
 #ifdef USING_X11
@@ -19,6 +20,7 @@ class MUI_PUBLIC MythXDisplay
     MythXDisplay() = default;
     ~MythXDisplay();
     Display *GetDisplay(void)          { return m_disp;       }
+    QString  GetDisplayName(void) const{ return m_displayName;}
     int      GetScreen(void) const     { return m_screen_num; }
     void     Lock(void)                { m_lock.lock();       }
     void     Unlock(void)              { m_lock.unlock();     }
@@ -50,6 +52,7 @@ class MUI_PUBLIC MythXDisplay
     GC            m_gc         {nullptr};
     Window        m_root       {0};
     QMutex        m_lock       {QMutex::Recursive};
+    QString       m_displayName{};
 };
 
 class MythXLocker