Merge pull request #8569 from hez2010/visual-fixes

Avoid crashing when fail to create OpenGL context
AvaloniaUI · Aug 7, 2022 · 49aae75 · 49aae75
2 parents a1ae411 + e2ffdbd
commit 49aae75
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs b/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs
@@ -146,6 +146,13 @@ private bool EnsureInitializedCore()
                 return false;
             }
 
+            if (_context == null)
+            {
+                Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
+                    "Unable to initialize OpenGL: unable to create additional OpenGL context.");
+                return false;
+            }
+
             GlVersion = _context.Version;
             try
             {