Merge pull request #8569 from hez2010/visual-fixes

Avoid crashing when fail to create OpenGL context
AvaloniaUI · Aug 12, 2022 · 7eb0a48 · 7eb0a48
1 parent 5f9c852
commit 7eb0a48
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
@@ -148,6 +148,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
             {