aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRainer Hochecker <fernetmenta@online.de>2018-01-14 17:24:21 +0100
committerGitHub <noreply@github.com>2018-01-14 17:24:21 +0100
commit79b9e4860cbea43afd2398b7497a738836ed170b (patch)
treebf8b40e327718e7f0862ccb4d489400f243cb2e2
parent732be44bd71ce587c641ec68248cf4183d596904 (diff)
parent3d40566fd6d74d7aecd63b035930d0a3f095f661 (diff)
Merge pull request #13362 from FernetMenta/x11
X11: fix videosync on Intel
-rw-r--r--xbmc/windowing/X11/WinSystemX11GLContext.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/xbmc/windowing/X11/WinSystemX11GLContext.cpp b/xbmc/windowing/X11/WinSystemX11GLContext.cpp
index 24394d7631..4876381364 100644
--- a/xbmc/windowing/X11/WinSystemX11GLContext.cpp
+++ b/xbmc/windowing/X11/WinSystemX11GLContext.cpp
@@ -305,7 +305,10 @@ std::unique_ptr<CVideoSync> CWinSystemX11GLContext::GetVideoSync(void *clock)
{
pVSync.reset(new CVideoSyncDRM(clock, *this));
}
- pVSync.reset(X11::GLXVideoSyncCreate(clock, *this));
+ else
+ {
+ pVSync.reset(X11::GLXVideoSyncCreate(clock, *this));
+ }
return pVSync;
}