Skip to content

Commit 1d69295

Browse files
campersauamaitland
authored andcommitted
OffScreen - Check if browser is not null in GetScreenInfo/GetViewRect (#4661)
1 parent cda78d0 commit 1d69295

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

CefSharp.OffScreen/DefaultRenderHandler.cs

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,14 @@ public void Dispose()
9898
/// <returns>Return null if no screenInfo structure is provided.</returns>
9999
public virtual ScreenInfo? GetScreenInfo()
100100
{
101-
var screenInfo = new ScreenInfo { DeviceScaleFactor = browser.DeviceScaleFactor };
101+
var deviceScaleFactor = browser?.DeviceScaleFactor;
102+
103+
if (deviceScaleFactor == null)
104+
{
105+
return null;
106+
}
107+
108+
var screenInfo = new ScreenInfo { DeviceScaleFactor = deviceScaleFactor.Value };
102109

103110
return screenInfo;
104111
}
@@ -111,9 +118,14 @@ public void Dispose()
111118
public virtual Rect GetViewRect()
112119
{
113120
//TODO: See if this can be refactored and remove browser reference
114-
var size = browser.Size;
121+
var size = browser?.Size;
122+
123+
if (size == null)
124+
{
125+
return new Rect(0, 0, 1, 1);
126+
}
115127

116-
var viewRect = new Rect(0, 0, size.Width, size.Height);
128+
var viewRect = new Rect(0, 0, size.Value.Width, size.Value.Height);
117129

118130
return viewRect;
119131
}

0 commit comments

Comments
 (0)