Merge pull request #127 from buchizo/fix-nullref-singleeach

fix null ref exception of singleEach on wakeup
buchizo · Aug 18, 2022 · 4f616c9 · 4f616c9
2 parents 8862f8e + 9f9a5f8
commit 4f616c9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/ClaudiaIDE/source.extension.vsixmanifest b/ClaudiaIDE/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="ClaudiaIDE..7442ac19-889b-4699-a817-e6e054877ee3" Version="3.1.1" Language="en-US" Publisher="buchizo" />
+        <Identity Id="ClaudiaIDE..7442ac19-889b-4699-a817-e6e054877ee3" Version="3.1.2" Language="en-US" Publisher="buchizo" />
         <DisplayName>ClaudiaIDE</DisplayName>
         <Description xml:space="preserve">This extension change the background image of editor.</Description>
         <MoreInfo>https://github.com/buchizo/ClaudiaIDE</MoreInfo>

diff --git a/ClaudiaIDE16/source.extension.vsixmanifest b/ClaudiaIDE16/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="ClaudiaIDE2019.9ab800ef-0cff-4893-bf16-57d58ff53456" Version="3.1.1" Language="en-US" Publisher="k.buchi" />
+        <Identity Id="ClaudiaIDE2019.9ab800ef-0cff-4893-bf16-57d58ff53456" Version="3.1.2" Language="en-US" Publisher="k.buchi" />
         <DisplayName>ClaudiaIDE 2019</DisplayName>
         <Description xml:space="preserve">This extension change the background image of editor.</Description>
         <MoreInfo>https://github.com/buchizo/ClaudiaIDE</MoreInfo>

diff --git a/Shared/ClaudiaIdePackage.cs b/Shared/ClaudiaIdePackage.cs
@@ -19,7 +19,7 @@
 namespace ClaudiaIDE
 {
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
-    [InstalledProductRegistration("#110", "#112", "3.1.1", IconResourceID = 400)]
+    [InstalledProductRegistration("#110", "#112", "3.1.2", IconResourceID = 400)]
     [ProvideOptionPage(typeof(ClaudiaIdeOptionPageGrid), "ClaudiaIDE", "General", 110, 116, true)]
     [Guid(GuidList.PackageId)]
     [ProvideAutoLoad("{ADFC4E65-0397-11D1-9F4E-00A0C911004F}",

diff --git a/Shared/ImageProviders/SingleImageEachProvider.cs b/Shared/ImageProviders/SingleImageEachProvider.cs
@@ -29,6 +29,12 @@ private ImageFiles GetImagesFromDirectory()
 
         public override BitmapSource GetBitmap()
         {
+            if (_imageFiles == null)
+            {
+                _imageFiles = GetImagesFromDirectory();
+                _imageFilesPath = _imageFiles.GetEnumerator();
+                _imageFilesPath.MoveNext();
+            }
             var current = _imageFilesPath?.Current;
             if (string.IsNullOrEmpty(current)) return null;
 
@@ -68,6 +74,11 @@ protected override void OnSettingChanged(object sender, EventArgs e)
 
         public void NextImage()
         {
+            if (_imageFiles == null)
+            {
+                _imageFiles = GetImagesFromDirectory();
+                _imageFilesPath = _imageFiles.GetEnumerator();
+            }
             if (!_imageFilesPath.MoveNext())
                 if (Setting.LoopSlideshow)
                 {