Skip to content

Commit 4ef6985

Browse files
committed
fix null crash
1 parent adb52c2 commit 4ef6985

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

ModernFlyouts.Package/ModernFlyouts.Package.wapproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@
120120
<ItemGroup>
121121
<ProjectReference Include="..\ModernFlyoutsHost\ModernFlyoutsHost.vcxproj" />
122122
<ProjectReference Include="..\ModernFlyouts\ModernFlyouts.csproj">
123-
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
124-
<PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
123+
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
124+
<PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
125125
</ProjectReference>
126126
<ProjectReference Include="..\ModernFlyoutsBridge\ModernFlyoutsBridge.vcxproj" />
127127
</ItemGroup>
@@ -130,7 +130,8 @@
130130
<_TemporaryFilteredWapProjOutput Include="@(_FilteredNonWapProjProjectOutput)" />
131131
<_FilteredNonWapProjProjectOutput Remove="@(_TemporaryFilteredWapProjOutput)" />
132132
<_FilteredNonWapProjProjectOutput Include="@(_TemporaryFilteredWapProjOutput)">
133-
<SourceProject></SourceProject>
133+
<SourceProject>
134+
</SourceProject>
134135
</_FilteredNonWapProjProjectOutput>
135136
</ItemGroup>
136137
</Target>

ModernFlyouts.Package/Package.appxmanifest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
<Identity
1212
Name="32669SamG.ModernFlyouts"
13-
Publisher="CN=E3B4A0F6-E459-414C-8DFB-ABEAB07C9242"
14-
Version="0.9.1.0" />
13+
Publisher="CN=samue"
14+
Version="0.9.5.0" />
1515

1616
<Properties>
1717
<DisplayName>ms-resource:Resources/PackageDisplayName</DisplayName>

ModernFlyouts/FlyoutHandler.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,10 @@ private void OnNativeFlyoutShown()
342342
});
343343
}
344344

345-
prevTriggerData.IsExpired = true;
345+
if (prevTriggerData != null)
346+
{
347+
prevTriggerData.IsExpired = true;
348+
}
346349
}
347350
else if (DefaultFlyout == DefaultFlyout.None)
348351
{

0 commit comments

Comments
 (0)