From c36493d1deccb0b9dc32fb8c631e94d3b9cfdeaf Mon Sep 17 00:00:00 2001
From: Dragorn421 <Dragorn421@users.noreply.github.com>
Date: Mon, 5 Aug 2024 19:24:14 +0200
Subject: [PATCH] Fixup GlxDisplay.CreateContext (#16540)

Co-authored-by: Max Katz <maxkatz6@outlook.com>
Co-authored-by: Julien Lebosquain <julien@lebosquain.net>
---
 src/Avalonia.X11/Glx/GlxDisplay.cs | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.X11/Glx/GlxDisplay.cs b/src/Avalonia.X11/Glx/GlxDisplay.cs
index 3a0a4026d8..190677074a 100644
--- a/src/Avalonia.X11/Glx/GlxDisplay.cs
+++ b/src/Avalonia.X11/Glx/GlxDisplay.cs
@@ -166,16 +166,19 @@ namespace Avalonia.X11.Glx
                 rv = Create(_version.Value);
             }
             
-            foreach (var v in _probeProfiles)
+            if (rv == null)
             {
-                if (v.Type == GlProfileType.OpenGLES
-                    && !_displayExtensions.Contains("GLX_EXT_create_context_es2_profile"))
-                    continue;
-                rv = Create(v);
-                if (rv != null)
+                foreach (var v in _probeProfiles)
                 {
-                    _version = v;
-                    break;
+                    if (v.Type == GlProfileType.OpenGLES
+                        && !_displayExtensions.Contains("GLX_EXT_create_context_es2_profile"))
+                        continue;
+                    rv = Create(v);
+                    if (rv != null)
+                    {
+                        _version = v;
+                        break;
+                    }
                 }
             }