From 868af589f8861c15b30b843e2e93cba0361315aa Mon Sep 17 00:00:00 2001
From: Joel Wetzell <jwetzell@yahoo.com>
Date: Thu, 10 Sep 2020 12:26:19 -0500
Subject: [PATCH] Make Cue notes property null-safe

---
 QControlKit/QControlKit.csproj                              | 2 +-
 QControlKit/QCue.cs                                         | 6 ++++--
 QControlKit/QWorkspace.cs                                   | 2 +-
 QControlKitXamDemo/QControlKitXamDemo.iOS/AppDelegate.cs    | 2 +-
 .../QControlKitXamDemo.iOS/QControlKitXamDemo.iOS.csproj    | 2 +-
 .../QControlKitXamDemo/QControlKitXamDemo.csproj            | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/QControlKit/QControlKit.csproj b/QControlKit/QControlKit.csproj
index 7c17cac..1c74734 100644
--- a/QControlKit/QControlKit.csproj
+++ b/QControlKit/QControlKit.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.9.0" />
+    <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="Zeroconf" Version="3.4.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
diff --git a/QControlKit/QCue.cs b/QControlKit/QCue.cs
index 73ced36..86aba99 100644
--- a/QControlKit/QCue.cs
+++ b/QControlKit/QCue.cs
@@ -239,7 +239,10 @@ namespace QControlKit
         {
             get
             {
-                return propertyForKey(QOSCKey.Notes).ToString();
+                if (propertyForKey(QOSCKey.Notes) != null)
+                    return propertyForKey(QOSCKey.Notes).ToString();
+                else
+                    return "";
             }
             set
             {
@@ -568,7 +571,6 @@ namespace QControlKit
 
             if (!cueUpdated)
                 return false;
-            
             OnCuePropertiesUpdated(propertiesUpdated);
             return true;
         }
diff --git a/QControlKit/QWorkspace.cs b/QControlKit/QWorkspace.cs
index 687b170..2f0b6dd 100644
--- a/QControlKit/QWorkspace.cs
+++ b/QControlKit/QWorkspace.cs
@@ -342,7 +342,7 @@ namespace QControlKit
             string[] keys = new string[] {  QOSCKey.Name, QOSCKey.Number, QOSCKey.FileTarget, QOSCKey.CueTargetNumber, 
                                             QOSCKey.HasFileTargets, QOSCKey.HasCueTargets, QOSCKey.Armed, QOSCKey.ColorName, 
                                             QOSCKey.ContinueMode, QOSCKey.Flagged, QOSCKey.PreWait, QOSCKey.PostWait, 
-                                            QOSCKey.Duration, QOSCKey.AllowsEditingDuration };
+                                            QOSCKey.Duration, QOSCKey.AllowsEditingDuration, QOSCKey.Notes };
             fetchPropertiesForCue(cue, keys, false);
         }
 
diff --git a/QControlKitXamDemo/QControlKitXamDemo.iOS/AppDelegate.cs b/QControlKitXamDemo/QControlKitXamDemo.iOS/AppDelegate.cs
index 7b9b1e7..fc3ccfd 100644
--- a/QControlKitXamDemo/QControlKitXamDemo.iOS/AppDelegate.cs
+++ b/QControlKitXamDemo/QControlKitXamDemo.iOS/AppDelegate.cs
@@ -23,7 +23,7 @@ namespace QControlKitXamDemo.iOS
         public override bool FinishedLaunching(UIApplication app, NSDictionary options)
         {
             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());
 
             return base.FinishedLaunching(app, options);
diff --git a/QControlKitXamDemo/QControlKitXamDemo.iOS/QControlKitXamDemo.iOS.csproj b/QControlKitXamDemo/QControlKitXamDemo.iOS/QControlKitXamDemo.iOS.csproj
index 42c54e1..2617a01 100644
--- a/QControlKitXamDemo/QControlKitXamDemo.iOS/QControlKitXamDemo.iOS.csproj
+++ b/QControlKitXamDemo/QControlKitXamDemo.iOS/QControlKitXamDemo.iOS.csproj
@@ -124,7 +124,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Serilog">
-      <Version>2.9.0</Version>
+      <Version>2.10.0</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Sinks.Xamarin">
       <Version>0.2.0.64</Version>
diff --git a/QControlKitXamDemo/QControlKitXamDemo/QControlKitXamDemo.csproj b/QControlKitXamDemo/QControlKitXamDemo/QControlKitXamDemo.csproj
index 560a9b0..fcd1492 100644
--- a/QControlKitXamDemo/QControlKitXamDemo/QControlKitXamDemo.csproj
+++ b/QControlKitXamDemo/QControlKitXamDemo/QControlKitXamDemo.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <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.Essentials" Version="1.5.3.2" />
   </ItemGroup>