Fix V3002, V3114 warnings from PVS-Studio Static Analyzer

1 files changed, 9 insertions, 6 deletions

diff --git a/Histacom2.Engine/UI/ClassicStartMenuItem.cs b/Histacom2.Engine/UI/ClassicStartMenuItem.cs
index dcb8361..463cf8f 100644
--- a/Histacom2.Engine/UI/ClassicStartMenuItem.cs
+++ b/Histacom2.Engine/UI/ClassicStartMenuItem.cs
@@ -57,21 +57,24 @@ namespace Histacom2.Engine.UI
                 if (BackgroundImageLayout == ImageLayout.Stretch) e.Graphics.DrawImage(BackgroundImage, new Rectangle(0, 0, Width, Height + 9));
             }
 
-            if (Selected)
+            int imgWidth = 0;
+            if (Image != null)
+            {
+                if (Selected)
             {
                 if (SaveSystem.currentTheme != null && DoBackColorAdapt) e.Graphics.FillRectangle(new SolidBrush(SaveSystem.currentTheme.selectedBackColor), new Rectangle(0, 0, Width, Image.Height));
                 else e.Graphics.FillRectangle(Brushes.Navy, new Rectangle(0, 0, Width, Image.Height));
             }
 
             e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit;
+            e.Graphics.DrawImage(Image, 0 + Padding.Left - Padding.Right, 0); imgWidth = Image.Width;
+            
 
+             }
+            //if (Image != null) if (Height != Image.Height) if (layout == ClassicStartMenuItemLayout.CloseTitleWithLightSubtitle && Height != Image.Height + 8) { Height = Image.Height; }
             StringFormat sf = new StringFormat();
             sf.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show;
 
-            int imgWidth = 0;
-            if (Image != null) { e.Graphics.DrawImage(Image, 0 + Padding.Left - Padding.Right, 0); imgWidth = Image.Width; }
-            //if (Image != null) if (Height != Image.Height) if (layout == ClassicStartMenuItemLayout.CloseTitleWithLightSubtitle && Height != Image.Height + 8) { Height = Image.Height; }
-
             if (!Selected) {
                 switch (layout) {
                     case ClassicStartMenuItemLayout.DistancedTitle:
@@ -133,7 +136,7 @@ namespace Histacom2.Engine.UI
     {
         DistancedTitle,
         CloseTitle,
-        CloseTitleWithTwoLines,
+        //CloseTitleWithTwoLines,
         CloseTitleWithLightSubtitle
     }
 }