autoset new wallpaper fixed

jamie-mh · Apr 5, 2019 · cd98f6c · cd98f6c
1 parent 643ebe8
commit cd98f6c
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 37 deletions.
diff --git a/BingWallpaper/App.config b/BingWallpaper/App.config
@@ -2,14 +2,14 @@
 <configuration>
   <configSections>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="BingWallpaper.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="BingWallpaper.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
   </configSections>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
   </startup>
   <appSettings>
-    <add key="ClientSettingsProvider.ServiceUri" value="" />
+    <add key="ClientSettingsProvider.ServiceUri" value=""/>
   </appSettings>
   <userSettings>
     <BingWallpaper.Properties.Settings>
@@ -27,13 +27,13 @@
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">
       <providers>
-        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
       </providers>
     </membership>
     <roleManager defaultProvider="ClientRoleProvider" enabled="true">
       <providers>
-        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
       </providers>
     </roleManager>
   </system.web>
-</configuration>
+</configuration>
diff --git a/BingWallpaper/BingWallpaper.csproj b/BingWallpaper/BingWallpaper.csproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>BingWallpaper</RootNamespace>
     <AssemblyName>BingWallpaper</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
@@ -54,8 +54,8 @@
     <ApplicationIcon>bing.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="RestSharp, Version=106.6.7.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
-      <HintPath>..\packages\RestSharp.106.6.7\lib\net452\RestSharp.dll</HintPath>
+    <Reference Include="RestSharp, Version=106.6.9.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.106.6.9\lib\net452\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/BingWallpaper/FormAbout.Designer.cs b/BingWallpaper/FormAbout.Designer.cs
diff --git a/BingWallpaper/FormMain.Designer.cs b/BingWallpaper/FormMain.Designer.cs
diff --git a/BingWallpaper/FormMain.cs b/BingWallpaper/FormMain.cs
@@ -12,7 +12,6 @@ public partial class FormMain : Form
         private BingClient _bingClient;
 
         private bool _exiting;
-        private DateTime _lastOpen;
         private int _currentImage = 0;
 
         public FormMain()
@@ -21,13 +20,13 @@ public FormMain()
 
             _bingClient = new BingClient();
             _exiting = false;
-            _lastOpen = DateTime.Now;
         }
 
         private void FormMain_Shown(object sender, EventArgs e)
         {
             SetFormLocation();
             AttemptUpdate();
+            _currentImage = 0;
 
             if(_bingClient.Images.Count > 0)
                 LoadPreview();
@@ -124,8 +123,7 @@ private void toolStripMenuItemExit_Click(object sender, EventArgs e)
         private void toolStripMenuItemShow_Click(object sender, EventArgs e)
         {
             Visible = true;
-            SetFormLocation();
-            AttemptUpdate();
+            FormMain_Shown(sender, e);
         }
 
         private void buttonNext_Click(object sender, EventArgs e)
@@ -171,7 +169,7 @@ private void timer_Tick(object sender, EventArgs e)
             if(Properties.Settings.Default.AutomaticallySetNewWallpaper &&
                _bingClient.Images[0].Hash != previousHash)
             {
-                SetWallpaper(0, true);
+                _ = SetWallpaper(0, true);
             }
         }
 

diff --git a/BingWallpaper/FormOptions.Designer.cs b/BingWallpaper/FormOptions.Designer.cs
diff --git a/BingWallpaper/FormOptions.cs b/BingWallpaper/FormOptions.cs
@@ -71,6 +71,7 @@ private void FormOptions_Load(object sender, EventArgs e)
             comboLocale.SelectedValue = Properties.Settings.Default.Locale;
 
             checkBoxRunAtStartup.Checked = Properties.Settings.Default.RunAtStartup;
+            checkBoxAutomaticWallpaper.Checked = Properties.Settings.Default.AutomaticallySetNewWallpaper;
         }
 
         private void buttonOK_Click(object sender, EventArgs e)
@@ -85,6 +86,7 @@ private void buttonOK_Click(object sender, EventArgs e)
             subkey.Close();
             Properties.Settings.Default.Locale = comboLocale.SelectedValue.ToString();
             Properties.Settings.Default.RunAtStartup = checkBoxRunAtStartup.Checked;
+            Properties.Settings.Default.AutomaticallySetNewWallpaper = checkBoxAutomaticWallpaper.Checked;
             Properties.Settings.Default.Save();
             Close();
         }

diff --git a/BingWallpaper/Properties/Resources.Designer.cs b/BingWallpaper/Properties/Resources.Designer.cs
diff --git a/BingWallpaper/Properties/Settings.Designer.cs b/BingWallpaper/Properties/Settings.Designer.cs
diff --git a/BingWallpaper/packages.config b/BingWallpaper/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="RestSharp" version="106.6.7" targetFramework="net461" />
+  <package id="RestSharp" version="106.6.9" targetFramework="net472" />
 </packages>