projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Don't try opening error dialogues from the GL thread.
[dcpomatic.git]
/
src
/
wx
/
gl_video_view.h
diff --git
a/src/wx/gl_video_view.h
b/src/wx/gl_video_view.h
index a9264f05dd6d0cdaa8b3e049a84b24b371e894e0..614393024bfc825231990351d8d589be49ca2cfb 100644
(file)
--- a/
src/wx/gl_video_view.h
+++ b/
src/wx/gl_video_view.h
@@
-55,6
+55,7
@@
private:
void thread ();
void request_one_shot ();
void create ();
+ void check_for_butler_errors ();
wxGLCanvas* _canvas;
wxGLContext* _context;
@@
-68,4
+69,6
@@
private:
boost::condition _playing_condition;
bool _playing;
bool _one_shot;
+
+ boost::shared_ptr<wxTimer> _timer;
};