diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-01-08 22:22:01 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-01-08 22:22:01 +0100 |
| commit | 579d18cb7770efe2da03afaf6a33faaf624119e3 (patch) | |
| tree | cc303d8c74e64fff8eb5a663941cac4455154ae9 /src/tools/dcpomatic.cc | |
| parent | dde431cafbb20ed3356ad5592be56af1d4458f46 (diff) | |
| parent | 23590dc430e4ef2351209e30a26ba04fecca2872 (diff) | |
Merge a set of changes which run the OpenGL video updates in a separatev2.15.40
thread, hopefully making things more elegant and robust.
Diffstat (limited to 'src/tools/dcpomatic.cc')
| -rw-r--r-- | src/tools/dcpomatic.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 68bf20732..47851a218 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -92,6 +92,9 @@ #include <wx/preferences.h> #include <wx/splash.h> #include <wx/wxhtml.h> +#ifdef __WXGTK__ +#include <X11/Xlib.h> +#endif #ifdef __WXMSW__ #include <shellapi.h> #endif @@ -1503,7 +1506,11 @@ public: : wxApp () , _frame (0) , _splash (0) - {} + { +#ifdef DCPOMATIC_LINUX + XInitThreads (); +#endif + } private: |