vo_opengl/x11: fix automatic ICC profile loading

mpv would attempt to load ICC profiles several times during VO init
even if no window is displayed. This potentially causes it to load
a profile for a different screen than it is going to be displayed
on, thereby invalidating the profile cache and rebuilding the LUT
every single time.
It would not unload a previously loaded profile when the video
window is moved to a display without an installed profile.

Fix these issues and tweak the log messages a little.

1 files changed, 8 insertions, 6 deletions

diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index 9318914dbd..887a8d8fbd 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -254,15 +254,17 @@ static bool get_and_update_icc_profile(struct gl_priv *p, int *events)
 {
     if (p->icc_opts->profile_auto) {
         MP_VERBOSE(p, "Querying ICC profile...\n");
-        bstr icc;
+        bstr icc = bstr0(NULL);
         int r = p->glctx->vo_control(p->vo, events, VOCTRL_GET_ICC_PROFILE, &icc);
 
-        if (r == VO_TRUE) {
+        if (r != VO_NOTAVAIL) {
+            if (r == VO_FALSE) {
+                MP_WARN(p, "Could not retrieve an ICC profile.\n");
+            } else if (r == VO_NOTIMPL) {
+                MP_ERR(p, "icc-profile-auto not implemented on this platform.\n");
+            }
+
             gl_lcms_set_memory_profile(p->cms, &icc);
-        } else if (r == VO_NOTIMPL) {
-            MP_ERR(p, "icc-profile-auto not implemented on this platform.\n");
-        } else {
-            MP_ERR(p, "Could not retrieve an ICC profile.\n");
         }
     }