- Add null check for plugin result

- Minor code changes

src/DesktopMagic/CalendarManagment.cs

@@ -41,7 +41,7 @@ namespace DesktopMagic
             }
 
             // Create Google Calendar API service.
-            var service = new CalendarService(new BaseClientService.Initializer()
+            CalendarService service = new CalendarService(new BaseClientService.Initializer()
             {
                 HttpClientInitializer = credential,
                 ApplicationName = ApplicationName,

src/DesktopMagic/CalendarWindow.xaml.cs

@@ -68,7 +68,7 @@ namespace DesktopMagic
             base.OnSourceInitialized(e);
 
             //Set the window style to noactivate.
-            var helper = new WindowInteropHelper(this);
+            WindowInteropHelper helper = new WindowInteropHelper(this);
             WindowPos.SetWindowLong(helper.Handle, WindowPos.GWL_EXSTYLE,
             WindowPos.GetWindowLong(helper.Handle, WindowPos.GWL_EXSTYLE) | WindowPos.WS_EX_NOACTIVATE);
         }

src/DesktopMagic/CpuUsageWindow.xaml.cs

@@ -61,7 +61,7 @@ namespace DesktopMagic
             base.OnSourceInitialized(e);
 
             //Set the window style to noactivate.
-            var helper = new WindowInteropHelper(this);
+            WindowInteropHelper helper = new WindowInteropHelper(this);
             WindowPos.SetWindowLong(helper.Handle, WindowPos.GWL_EXSTYLE,
             WindowPos.GetWindowLong(helper.Handle, WindowPos.GWL_EXSTYLE) | WindowPos.WS_EX_NOACTIVATE);
         }
@@ -88,9 +88,10 @@ namespace DesktopMagic
 
         private void ValueTimer_Elapsed(object sender, ElapsedEventArgs e)
         {
+            string cpuUsage = GetCpuUsage();
             Dispatcher.Invoke(() =>
             {
-                textBlock.Text = GetCpuUsage();
+                textBlock.Text = cpuUsage;
             });
         }
 

src/DesktopMagic/DateWindow.xaml.cs

@@ -48,7 +48,7 @@ namespace DesktopMagic
             base.OnSourceInitialized(e);
 
             //Set the window style to noactivate.
-            var helper = new WindowInteropHelper(this);
+            WindowInteropHelper helper = new WindowInteropHelper(this);
             WindowPos.SetWindowLong(helper.Handle, WindowPos.GWL_EXSTYLE,
             WindowPos.GetWindowLong(helper.Handle, WindowPos.GWL_EXSTYLE) | WindowPos.WS_EX_NOACTIVATE);
         }

src/DesktopMagic/MainWindow.xaml

@@ -45,7 +45,7 @@
                 </DockPanel>
 
                 <DockPanel Grid.Column="1"  Margin="2.5,0,0,0">
-                    <ComboBox x:Name="optionsComboBox" DockPanel.Dock="Top" Height="24"  SelectedIndex="0" DisplayMemberPath="Item1" SelectionChanged="OptionsComboBox_SelectionChanged" Background="#FFECECEC" />
+                    <ComboBox x:Name="optionsComboBox" DockPanel.Dock="Top" Height="24"  SelectedIndex="0" DisplayMemberPath="Item1" SelectionChanged="OptionsComboBox_SelectionChanged" Background="#FFECECEC" Padding="4" VerticalAlignment="Center"/>
                     <ScrollViewer Background="#FFBBBBBB">
                         <Grid>
                             <StackPanel x:Name="optionsPanel" Margin="3,3,3,0" HorizontalAlignment="Stretch" Visibility="Collapsed" >

src/DesktopMagic/MainWindow.xaml.cs

@@ -321,7 +321,7 @@ namespace DesktopMagic
                 EditCheckBox_Click(null, null);
                 this.ShowInTaskbar = false;
                 this.Visibility = Visibility.Collapsed;
-                foreach (var item in Windows)
+                foreach (Window item in Windows)
                 {
                     WindowPos.SendWpfWindowBack(item);
                     WindowPos.SendWpfWindowBack(item);

src/DesktopMagic/MusicVisualizerWindow.xaml.cs

@@ -76,7 +76,7 @@ namespace DesktopMagic
             base.OnSourceInitialized(e);
 
             //Set the window style to noactivate.
-            var helper = new WindowInteropHelper(this);
+            WindowInteropHelper helper = new WindowInteropHelper(this);
             WindowPos.SetWindowLong(helper.Handle, WindowPos.GWL_EXSTYLE,
             WindowPos.GetWindowLong(helper.Handle, WindowPos.GWL_EXSTYLE) | WindowPos.WS_EX_NOACTIVATE);
         }

src/DesktopMagic/Plugin/PluginWindow.xaml.cs

@@ -146,7 +146,7 @@ namespace DesktopMagic
             Assembly dll = Assembly.Load(assemblyBytes);
             Type instanceType = dll.GetTypes().FirstOrDefault(type => type.GetTypeInfo().BaseType == typeof(Plugin));
 
-            foreach (var item in dll.GetTypes())
+            foreach (Type item in dll.GetTypes())
             {
                 Debug.WriteLine(item.Name);
                 Debug.WriteLine(typeof(Plugin).Name);
@@ -249,6 +249,8 @@ namespace DesktopMagic
                         valueTimer.Stop();
                     }
 
+                    if (result is not null)
+                    {
                         //Update Image
                         Dispatcher.Invoke(() =>
                         {
@@ -256,6 +258,7 @@ namespace DesktopMagic
                         });
                     }
                 }
+            }
             catch (Exception ex)
             {
                 stop = true;

src/DesktopMagic/TimeWindow.xaml.cs

@@ -48,7 +48,7 @@ namespace DesktopMagic
             base.OnSourceInitialized(e);
 
             //Set the window style to noactivate.
-            var helper = new WindowInteropHelper(this);
+            WindowInteropHelper helper = new WindowInteropHelper(this);
             WindowPos.SetWindowLong(helper.Handle, WindowPos.GWL_EXSTYLE,
             WindowPos.GetWindowLong(helper.Handle, WindowPos.GWL_EXSTYLE) | WindowPos.WS_EX_NOACTIVATE);
         }