JMR-dev/redshift-rebooted
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #523: Retry SetDeviceGammaRamp before giving up

Browse Source 
We have to retry SetDeviceGammaRamp a few times before giving up
because some buggy drivers fail on the first invocation just to
succeed on the second.
This commit is contained in:
dev7355608
2017-09-27 16:20:47 +02:00
parent 55c3c1fbeb
commit d9d7218cc8
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gamma-w32gdi.c
+15 -5
View File
@@ -37,6 +37,7 @@
#include "colorramp.h"
#define GAMMA_RAMP_SIZE 256
#define MAX_ATTEMPTS 10
int
@@ -136,7 +137,13 @@ w32gdi_restore(w32gdi_state_t *state)
}
/* Restore gamma ramps */
BOOL r = SetDeviceGammaRamp(hDC, state->saved_ramps);
BOOL r = FALSE;
for (int i = 0; i < MAX_ATTEMPTS && !r; i++) {
/* We retry a few times before giving up because some
buggy drivers fail on the first invocation of
SetDeviceGammaRamp just to succeed on the second. */
r = SetDeviceGammaRamp(hDC, state->saved_ramps);
}
if (!r) fputs(_("Unable to restore gamma ramps.\n"), stderr);
/* Release device context */
@@ -187,11 +194,14 @@ w32gdi_set_temperature(w32gdi_state_t *state,
setting);
/* Set new gamma ramps */
r = SetDeviceGammaRamp(hDC, gamma_ramps);
r = FALSE;
for (int i = 0; i < MAX_ATTEMPTS && !r; i++) {
/* We retry a few times before giving up because some
buggy drivers fail on the first invocation of
SetDeviceGammaRamp just to succeed on the second. */
r = SetDeviceGammaRamp(hDC, gamma_ramps);
}
if (!r) {
/* TODO it happens that SetDeviceGammaRamp returns FALSE on
occasions where the adjustment seems to be successful.
Does this only happen with multiple monitors connected? */
fputs(_("Unable to set gamma ramps.\n"), stderr);
free(gamma_ramps);
ReleaseDC(NULL, hDC);