Fixed some fatal problems.

t-miyake · Oct 1, 2017 · a3484e2 · a3484e2
1 parent b2eb5b4
commit a3484e2
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/PocketFanController/AboutWindow.xaml b/PocketFanController/AboutWindow.xaml
@@ -7,7 +7,7 @@
         Title="About | Pocket Fan Controller" Height="300" Width="300" ScrollViewer.VerticalScrollBarVisibility="Disabled" ShowInTaskbar="False" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
     <StackPanel>
         <TextBlock Padding="8,0,0,0" Margin="0,5,0,0">Pocket Fan Controller</TextBlock>
-        <TextBlock Padding="15,0,0,0">Version 0.5.0</TextBlock>
+        <TextBlock Padding="15,0,0,0">Version 0.5.1</TextBlock>
         <TextBlock Padding="15,0,0,0">© 2017 Takafumi Miyake</TextBlock>
 
         <TextBlock Padding="8,0,0,0" Margin="0,10,0,0">Third-Party Software Usage and Licenses</TextBlock>

diff --git a/PocketFanController/ConfigWindowViewModel.cs b/PocketFanController/ConfigWindowViewModel.cs
@@ -62,13 +62,15 @@ public ConfigWindowViewModel()
 
             OkButton = new RelayCommand(() =>
             {
-                Model.SaveManualConfig(Margin,BorderOfSlow,BorderOfFast,BorderOfFastest);
+                Model.SaveManualConfig(Margin, BorderOfSlow, BorderOfFast, BorderOfFastest);
+                SetManual();
                 Application.Current.MainWindow.Close();
             });
 
             ApplyButton = new RelayCommand(() =>
             {
                 Model.SaveManualConfig(Margin, BorderOfSlow, BorderOfFast, BorderOfFastest);
+                SetManual();
                 MessageBox.Show("Apply completed.");
             });
 
@@ -81,6 +83,14 @@ public ConfigWindowViewModel()
             UpdateStatus();
         }
 
+        private void SetManual()
+        {
+            if (Model.CurrentState == 5)
+            {
+                Model.SetManual();
+            }
+        }
+
         private void UpdateStatus()
         {
             OnPropertyChanged("Margin");

diff --git a/PocketFanController/Model.cs b/PocketFanController/Model.cs
@@ -51,8 +51,11 @@ public void GetCurrentStatus()
                 }
             }
 
-            if (current.SequenceEqual(states[CurrentState])) return;
-            CurrentState = 5;
+            if (CurrentState != 5)
+            {
+                if (current.SequenceEqual(states[CurrentState])) return;
+                CurrentState = 5;
+            }
         }
 
         public void SetDefault()

diff --git a/PocketFanController/Properties/AssemblyInfo.cs b/PocketFanController/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.0.0")]
-[assembly: AssemblyFileVersion("0.5.0.0")]
+[assembly: AssemblyVersion("0.5.1.0")]
+[assembly: AssemblyFileVersion("0.5.1.0")]
 [assembly: NeutralResourcesLanguage("en")]