Browse Source

Code refactoring

Ruben 4 years ago
parent
commit
3889483d77

+ 3 - 0
.editorconfig

@@ -5,3 +5,6 @@ dotnet_diagnostic.CS8604.severity = silent
 
 
 # Default severity for analyzer diagnostics with category 'Style'
 # Default severity for analyzer diagnostics with category 'Style'
 dotnet_analyzer_diagnostic.category-Style.severity = none
 dotnet_analyzer_diagnostic.category-Style.severity = none
+
+# CS8602: Dereference of a possibly null reference.
+dotnet_diagnostic.CS8602.severity = silent

+ 9 - 4
PicView/ChangeTitlebar/SetTitle.cs

@@ -128,7 +128,7 @@ namespace PicView.UILogic
         /// <param name="height"></param>
         /// <param name="height"></param>
         internal static void SetTitleString(int width, int height)
         internal static void SetTitleString(int width, int height)
         {
         {
-            string path = GetURL(ConfigureWindows.GetMainWindow.TitleText.Text);
+            string? path = GetURL(ConfigureWindows.GetMainWindow.TitleText.Text);
 
 
             path = string.IsNullOrWhiteSpace(path) ? Application.Current.Resources["Image"] as string : path;
             path = string.IsNullOrWhiteSpace(path) ? Application.Current.Resources["Image"] as string : path;
 
 
@@ -140,9 +140,14 @@ namespace PicView.UILogic
 
 
         internal static void SetLoadingString()
         internal static void SetLoadingString()
         {
         {
-            ConfigureWindows.GetMainWindow.Title = Application.Current.Resources["Loading"] as string;
-            ConfigureWindows.GetMainWindow.TitleText.Text = Application.Current.Resources["Loading"] as string;
-            ConfigureWindows.GetMainWindow.TitleText.ToolTip = Application.Current.Resources["Loading"] as string;
+            var s = Application.Current.Resources["Loading"] as string;
+            if (s == null || ConfigureWindows.GetMainWindow.Title == null || ConfigureWindows.GetMainWindow.TitleText == null)
+            {
+                return;
+            }
+            ConfigureWindows.GetMainWindow.Title = s;
+            ConfigureWindows.GetMainWindow.TitleText.Text = s;
+            ConfigureWindows.GetMainWindow.TitleText.ToolTip = s;
         }
         }
     }
     }
 }
 }

+ 1 - 1
PicView/Editing/Crop/CropFunctions.cs

@@ -105,7 +105,7 @@ namespace PicView.Editing.Crop
                 FileName = fileName
                 FileName = fileName
             };
             };
 
 
-            if (!Savedlg.ShowDialog().Value)
+            if (!Savedlg.ShowDialog().HasValue)
             {
             {
                 return;
                 return;
             }
             }

+ 1 - 1
PicView/FileHandling/RecentFiles.cs

@@ -76,7 +76,7 @@ namespace PicView.FileHandling
         /// <summary>
         /// <summary>
         /// Returns all values string[]
         /// Returns all values string[]
         /// </summary>
         /// </summary>
-        internal static string[] LoadValues()
+        internal static string[]? LoadValues()
         {
         {
             if (MRUlist == null)
             if (MRUlist == null)
             {
             {

+ 1 - 1
PicView/FileHandling/WebFunctions.cs

@@ -25,7 +25,7 @@ namespace PicView.FileHandling
         {
         {
             await ConfigureWindows.GetMainWindow.Dispatcher.BeginInvoke(DispatcherPriority.Normal, () =>
             await ConfigureWindows.GetMainWindow.Dispatcher.BeginInvoke(DispatcherPriority.Normal, () =>
             {
             {
-                ConfigureWindows.GetMainWindow.TitleText.Text = Application.Current.Resources["Loading"] as string;
+                SetTitle.SetLoadingString();
             });
             });