jwetzell/QControlKit
1
0
Fork 0
mirror of https://github.com/jwetzell/QControlKit.git synced 2026-08-22 23:49:13 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Make Cue notes property null-safe

Browse Source
This commit is contained in:
Joel Wetzell
2020-09-10 12:26:19 -05:00
parent 9b46f64aa0
commit 868af589f8
6 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
QControlKit/QControlKit.csproj
+1 -1
View File
@@ -11,7 +11,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Serilog" Version="2.9.0" /> <PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Zeroconf" Version="3.4.2" /> <PackageReference Include="Zeroconf" Version="3.4.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup> </ItemGroup>
QControlKit/QCue.cs
+4 -2
View File
@@ -239,7 +239,10 @@ namespace QControlKit
{ {
get get
{ {
return propertyForKey(QOSCKey.Notes).ToString(); if (propertyForKey(QOSCKey.Notes) != null)
return propertyForKey(QOSCKey.Notes).ToString();
else
return "";
} }
set set
{ {
@@ -568,7 +571,6 @@ namespace QControlKit
if (!cueUpdated) if (!cueUpdated)
return false; return false;
OnCuePropertiesUpdated(propertiesUpdated); OnCuePropertiesUpdated(propertiesUpdated);
return true; return true;
} }
QControlKit/QWorkspace.cs
+1 -1
View File
@@ -342,7 +342,7 @@ namespace QControlKit
string[] keys = new string[] { QOSCKey.Name, QOSCKey.Number, QOSCKey.FileTarget, QOSCKey.CueTargetNumber, string[] keys = new string[] { QOSCKey.Name, QOSCKey.Number, QOSCKey.FileTarget, QOSCKey.CueTargetNumber,
QOSCKey.HasFileTargets, QOSCKey.HasCueTargets, QOSCKey.Armed, QOSCKey.ColorName, QOSCKey.HasFileTargets, QOSCKey.HasCueTargets, QOSCKey.Armed, QOSCKey.ColorName,
QOSCKey.ContinueMode, QOSCKey.Flagged, QOSCKey.PreWait, QOSCKey.PostWait, QOSCKey.ContinueMode, QOSCKey.Flagged, QOSCKey.PreWait, QOSCKey.PostWait,
QOSCKey.Duration, QOSCKey.AllowsEditingDuration }; QOSCKey.Duration, QOSCKey.AllowsEditingDuration, QOSCKey.Notes };
fetchPropertiesForCue(cue, keys, false); fetchPropertiesForCue(cue, keys, false);
} }
QControlKitXamDemo/QControlKitXamDemo.iOS/AppDelegate.cs
+1 -1
View File
@@ -23,7 +23,7 @@ namespace QControlKitXamDemo.iOS
public override bool FinishedLaunching(UIApplication app, NSDictionary options) public override bool FinishedLaunching(UIApplication app, NSDictionary options)
{ {
global::Xamarin.Forms.Forms.Init(); global::Xamarin.Forms.Forms.Init();
Log.Logger = new LoggerConfiguration().WriteTo.NSLog().MinimumLevel.Information().CreateLogger(); Log.Logger = new LoggerConfiguration().WriteTo.NSLog().MinimumLevel.Debug().CreateLogger();
LoadApplication(new App()); LoadApplication(new App());
return base.FinishedLaunching(app, options); return base.FinishedLaunching(app, options);
QControlKitXamDemo/QControlKitXamDemo.iOS/QControlKitXamDemo.iOS.csproj
+1 -1
View File
@@ -124,7 +124,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Serilog"> <PackageReference Include="Serilog">
<Version>2.9.0</Version> <Version>2.10.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Serilog.Sinks.Xamarin"> <PackageReference Include="Serilog.Sinks.Xamarin">
<Version>0.2.0.64</Version> <Version>0.2.0.64</Version>
QControlKitXamDemo/QControlKitXamDemo/QControlKitXamDemo.csproj
+1 -1
View File
@@ -11,7 +11,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Serilog" Version="2.9.0" /> <PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1364" /> <PackageReference Include="Xamarin.Forms" Version="4.8.0.1364" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" /> <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
</ItemGroup> </ItemGroup>