analyser warnings

AntonyCorbett · Jul 29, 2023 · 40122f1 · 40122f1
1 parent e4f0133
commit 40122f1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 24 deletions.
diff --git a/OnlyM.Core/Services/Options/OptionsService.cs b/OnlyM.Core/Services/Options/OptionsService.cs
@@ -776,11 +776,7 @@ private Options WriteDefaultOptions()
             var result = new Options();
 
             // first time launched so set the monitor to the first one we find
-            var monitorService = Ioc.Default.GetService<IMonitorsService>();
-            if (monitorService == null)
-            {
-                throw new NotSupportedException("Could not get monitor service!");
-            }
+            var monitorService = Ioc.Default.GetService<IMonitorsService>() ?? throw new NotSupportedException("Could not get monitor service!");
 
             result.MediaMonitorId = monitorService.GetSystemMonitors().First().MonitorId;
 

diff --git a/OnlyM.Slides/SlideFile.cs b/OnlyM.Slides/SlideFile.cs
@@ -121,11 +121,7 @@ private SlidesConfig Load()
         {
             using (var zip = ZipFile.OpenRead(FilePath))
             {
-                var configEntry = zip.GetEntry(ConfigEntryName);
-                if (configEntry == null)
-                {
-                    throw new Exception($"Could not find {ConfigEntryName} entry");
-                }
+                var configEntry = zip.GetEntry(ConfigEntryName) ?? throw new Exception($"Could not find {ConfigEntryName} entry");
 
                 using (var stream = configEntry.Open())
                 {
@@ -134,25 +130,16 @@ private SlidesConfig Load()
                     using (var sr = new StreamReader(stream))
                     using (var jsonTextReader = new JsonTextReader(sr))
                     {
-                        var config = serializer.Deserialize<SlidesConfig>(jsonTextReader);
-                        if (config == null)
-                        {
-                            throw new Exception($"Could not read {ConfigEntryName} entry");
-                        }
-
-                        return config;
+                        return serializer.Deserialize<SlidesConfig>(jsonTextReader) 
+                               ?? throw new Exception($"Could not read {ConfigEntryName} entry");
                     }
                 }
             }
         }
 
         private static BitmapImage ReadBackgroundImage(ZipArchive zip, string entryName)
         {
-            var entry = zip.GetEntry(entryName);
-            if (entry == null)
-            {
-                throw new Exception($"Could not read {entryName} entry");
-            }
+            var entry = zip.GetEntry(entryName) ?? throw new Exception($"Could not read {entryName} entry");
 
             using (var stream = entry.Open())
             using (var memoryStream = new MemoryStream())

diff --git a/OnlyM/Services/MediaWindowPositionHelper.cs b/OnlyM/Services/MediaWindowPositionHelper.cs
@@ -108,9 +108,14 @@ private static void PrepareForWindowedDisplay(Window mediaWindow, Size windowSiz
         private static void PositionWindowUsingHack(
             Window mediaWindow, Grid? mainGrid, Screen monitor, int left, int top, int width, int height)
         {
-            Log.Logger.Verbose("Positioning media window according to WPF Media Foundation hack");
-
             var primaryMonitor = Screen.PrimaryScreen;
+
+            if (primaryMonitor == null)
+            {
+                return;
+            }
+
+            Log.Logger.Verbose("Positioning media window according to WPF Media Foundation hack");
 
             if (MonitorToRightOf(monitor, primaryMonitor))
             {
@@ -184,6 +189,11 @@ private static bool WpfMediaFoundationHackRequired(
         {
             var primaryMonitor = Screen.PrimaryScreen;
 
+            if (primaryMonitor == null)
+            {
+                return false;
+            }
+
             return
                 optionsService.RenderingMethod == RenderingMethod.MediaFoundation &&
                 isVideo &&