Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[macOS] Fix crash using Shell SearchHandler on Catalyst #11926

Merged
merged 13 commits into from
Feb 15, 2023
Merged

[macOS] Fix crash using Shell SearchHandler on Catalyst #11926

Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5a2b0a7
Fix crash using Shell SearchHandler on Catalyst
jsuarezruiz Dec 7, 2022
6d650a2
Merge branch 'main' into fix-11823
rmarinho Dec 12, 2022
eb247de
Updated changes
jsuarezruiz Dec 15, 2022
e807dae
Merge branch 'main' into fix-11823
jsuarezruiz Dec 19, 2022
ee8198f
Merge branch 'main' into fix-11823
jsuarezruiz Jan 16, 2023
c01f10c
Added device test
jsuarezruiz Jan 16, 2023
c7db962
Merge branch 'fix-11823' of https://github.com/dotnet/maui into fix-1…
jsuarezruiz Jan 16, 2023
8d7768d
Update src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/UIConta…
mattleibow Feb 1, 2023
992d881
Merge branch 'main' into fix-11823
jsuarezruiz Feb 10, 2023
51a8b8e
Fix merge issue
jsuarezruiz Feb 10, 2023
e8cfc29
Moved test
jsuarezruiz Feb 10, 2023
3e5341f
Merge branch 'main' into fix-11823
jsuarezruiz Feb 15, 2023
2641813
Fix build errors
jsuarezruiz Feb 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/UIContainerCell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using Foundation;
using ObjCRuntime;
using UIKit;
Expand All @@ -24,7 +24,7 @@ internal UIContainerCell(string cellId, View view, Shell shell, object context)

if (_renderer == null)
{
_renderer = (IPlatformViewHandler)view.ToHandler(shell.FindMauiContext());
_renderer = (IPlatformViewHandler)view.ToHandler(shell != null ? shell.FindMauiContext() : view.FindMauiContext());
mattleibow marked this conversation as resolved.
Show resolved Hide resolved
}

ContentView.AddSubview(_renderer.PlatformView);
Expand Down