summaryrefslogtreecommitdiffstats
path: root/OSX/XScreenSaverView.m
diff options
context:
space:
mode:
authorSimon Rettberg2019-02-18 11:55:58 +0100
committerSimon Rettberg2019-02-18 11:55:58 +0100
commitaa7530630e595b80d5db54655fd827b61edc0fd7 (patch)
tree048cb74072450c7592f254c3537ac8f252d09d73 /OSX/XScreenSaverView.m
parentForgot one DPMS killing instance (diff)
parentUpdate to 5.42 (diff)
downloadxscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.gz
xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.xz
xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.zip
Merge branch 'master' into openslxv23
Diffstat (limited to 'OSX/XScreenSaverView.m')
-rw-r--r--OSX/XScreenSaverView.m4
1 files changed, 2 insertions, 2 deletions
diff --git a/OSX/XScreenSaverView.m b/OSX/XScreenSaverView.m
index cb7d45b..371cf17 100644
--- a/OSX/XScreenSaverView.m
+++ b/OSX/XScreenSaverView.m
@@ -2059,10 +2059,10 @@ gl_check_ver (const struct gl_version *caps,
if (!initted_p || ![self isAnimating]) // no event handling unless running.
return NO;
- [self lockFocus];
+// [self lockFocus]; // As of 10.14 this causes flicker on mouse motion
[self prepareContext];
BOOL result = xsft->event_cb (xdpy, xwindow, xdata, e);
- [self unlockFocus];
+// [self unlockFocus];cp -Rf ${CONFIGURATION_BUILD_DIR}/BuildOutputPrefPane.prefPane ~/Library/PreferencePanes
return result;
}