diff options
| author | wm4 <wm4@nowhere> | 2015-05-18 22:25:59 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-05-18 22:25:59 +0200 |
| commit | be9bf4cc7c1b61a8abcbb3f64386ef10d8aa9f61 (patch) | |
| tree | ed02e0b7c1febeb42b7a0f8e6299e1882bac7143 /video/out/x11_common.h | |
| parent | 0d020c5c467e30c230b4ded00db938b1f4fcbb5e (diff) | |
| download | mpv-be9bf4cc7c1b61a8abcbb3f64386ef10d8aa9f61.tar.bz2 mpv-be9bf4cc7c1b61a8abcbb3f64386ef10d8aa9f61.tar.xz | |
x11: never forcefully terminate xdg-screensaver process
It sometimes happens on exit, and it's probably a bad idea. If the
process hangs on exit (possibly due to stupid hardcoded timeouts it's
doing), mpv will also hang now, unfortunately.
Diffstat (limited to 'video/out/x11_common.h')
| -rw-r--r-- | video/out/x11_common.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/video/out/x11_common.h b/video/out/x11_common.h index eeff773bef..c8ed22b248 100644 --- a/video/out/x11_common.h +++ b/video/out/x11_common.h @@ -24,6 +24,7 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> +#include "osdep/atomics.h" #include "osdep/semaphore.h" #include "common/common.h" @@ -61,8 +62,9 @@ struct vo_x11_state { bool dpms_touched; double screensaver_time_last; pthread_t screensaver_thread; + bool screensaver_thread_running; sem_t screensaver_sem; - struct mp_cancel *screensaver_terminate; + atomic_bool screensaver_terminate; XIM xim; XIC xic; |