fixed: since nvidia's 295 series driver, popen() hangs if there's a g…

…l context attached to the current thread, fixes xbmc#12746
bnkaplan · Mar 5, 2012 · a02f53c · a02f53c
1 parent da8f6fd
commit a02f53c
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/xbmc/video/VideoReferenceClock.cpp b/xbmc/video/VideoReferenceClock.cpp
@@ -398,7 +398,17 @@ bool CVideoReferenceClock::ParseNvSettings(int& RefreshRate)
     return false;
   }
 
+  //since nvidia's 295 series driver, popen will hang if there's a current GL context
+  //see trac ticket #12746
+  glXMakeCurrent(m_Dpy, None, NULL);
+
   NvSettings = popen(NVSETTINGSCMD, "r");
+
+  if (!m_bIsATI)
+    glXMakeCurrent(m_Dpy, m_Window, m_Context);
+  else
+    glXMakeCurrent(m_Dpy, m_glPixmap, m_Context);
+
   if (!NvSettings)
   {
     CLog::Log(LOGDEBUG, "CVideoReferenceClock: %s: %s", NVSETTINGSCMD, strerror(errno));