Browse Source
Merge pull request #10178 from workgroupengineering/fixes/Warnings/Nullable/Framebuffer
fix: Linux Framebuffer nullable
pull/10411/head
Max Katz
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
4 deletions
-
src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
-
src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
|
|
|
@ -154,7 +154,7 @@ public static class LinuxFramebufferPlatformExtensions |
|
|
|
var lifetime = LinuxFramebufferPlatform.Initialize(builder, outputBackend, inputBackend); |
|
|
|
builder.SetupWithLifetime(lifetime); |
|
|
|
lifetime.Start(args); |
|
|
|
builder.Instance.Run(lifetime.Token); |
|
|
|
builder.Instance!.Run(lifetime.Token); |
|
|
|
return lifetime.ExitCode; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -43,13 +43,13 @@ namespace Avalonia.LinuxFramebuffer.Output |
|
|
|
public IPlatformGraphics PlatformGraphics { get; private set; } |
|
|
|
|
|
|
|
public DrmOutput(DrmCard card, DrmResources resources, DrmConnector connector, DrmModeInfo modeInfo, |
|
|
|
DrmOutputOptions? options = null) |
|
|
|
DrmOutputOptions options = null) |
|
|
|
{ |
|
|
|
if(options != null) |
|
|
|
_outputOptions = options; |
|
|
|
Init(card, resources, connector, modeInfo); |
|
|
|
} |
|
|
|
public DrmOutput(string path = null, bool connectorsForceProbe = false, DrmOutputOptions? options = null) |
|
|
|
public DrmOutput(string path = null, bool connectorsForceProbe = false, DrmOutputOptions options = null) |
|
|
|
{ |
|
|
|
if(options != null) |
|
|
|
_outputOptions = options; |
|
|
|
@ -63,7 +63,7 @@ namespace Avalonia.LinuxFramebuffer.Output |
|
|
|
if(connector == null) |
|
|
|
throw new InvalidOperationException("Unable to find connected DRM connector"); |
|
|
|
|
|
|
|
DrmModeInfo? mode = null; |
|
|
|
DrmModeInfo mode = null; |
|
|
|
|
|
|
|
if (options?.VideoMode != null) |
|
|
|
{ |
|
|
|
|