diff --git a/FanCtrl.csproj b/FanCtrl.csproj index fcbb961..66d7ded 100644 --- a/FanCtrl.csproj +++ b/FanCtrl.csproj @@ -28,7 +28,7 @@ Lich FanCtrl 0 - 1.3.0.0 + 1.3.1.0 false true true diff --git a/FanCtrl/Controller/HidUSBController.cs b/FanCtrl/Controller/HidUSBController.cs index 0bdda8c..5f121e8 100644 --- a/FanCtrl/Controller/HidUSBController.cs +++ b/FanCtrl/Controller/HidUSBController.cs @@ -16,6 +16,7 @@ public class HidUSBController : USBController { // HidDevice private HidStream mHidStream = null; + private bool mIsOpen = false; private delegate void RecvDelegate(); private delegate void SendDelegate(); @@ -69,6 +70,7 @@ public override bool start(uint index) this.stop(); return false; } + mIsOpen = true; break; } i++; @@ -90,6 +92,7 @@ public override void stop() { try { + mIsOpen = false; if (mHidStream != null) { mHidStream.Close(); @@ -139,6 +142,9 @@ private async void readAsync() private void read() { + if (mIsOpen == false) + return; + try { if (mHidStream != null && mHidStream.CanRead == true) @@ -147,6 +153,10 @@ private void read() this.onRecv(buffer, buffer.Length); this.readAsync(); } + else + { + this.readAsync(); + } } catch { } } diff --git a/OptionForm.Designer.cs b/OptionForm.Designer.cs index d92bf30..66dbf67 100644 --- a/OptionForm.Designer.cs +++ b/OptionForm.Designer.cs @@ -515,7 +515,7 @@ private void InitializeComponent() // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.ClientSize = new System.Drawing.Size(209, 805); + this.ClientSize = new System.Drawing.Size(209, 809); this.Controls.Add(this.mResetButton); this.Controls.Add(this.mStartupDelayTextBox); this.Controls.Add(this.mStartupDelayLabel); diff --git a/OptionForm.cs b/OptionForm.cs index 0613308..3ceb21f 100644 --- a/OptionForm.cs +++ b/OptionForm.cs @@ -18,6 +18,18 @@ public OptionForm() InitializeComponent(); this.localizeComponent(); + if (Screen.PrimaryScreen.WorkingArea.Height < this.Height) + { + this.AutoScroll = true; + this.AutoSizeMode = AutoSizeMode.GrowOnly; + this.FormBorderStyle = FormBorderStyle.Sizable; + this.Width = this.Width + 10; + this.Height = this.Height - 100; + + this.MinimumSize = new Size(this.Width, 300); + this.MaximumSize = new Size(this.Width, Int32.MaxValue); + } + mToolTip.SetToolTip(mIntervalTextBox, "100 ≤ value ≤ 5000"); mToolTip.SetToolTip(mStartupDelayTextBox, "0 ≤ value ≤ 59"); diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index f34385f..bdfdb5e 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ // // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 // 기본값으로 할 수 있습니다. -[assembly: AssemblyVersion("1.3.0")] -[assembly: AssemblyFileVersion("1.3.0")] -[assembly: AssemblyInformationalVersion("1.3.0")] +[assembly: AssemblyVersion("1.3.1")] +[assembly: AssemblyFileVersion("1.3.1")] +[assembly: AssemblyInformationalVersion("1.3.1")] diff --git a/dll/LibreHardwareMonitorLib.dll b/dll/LibreHardwareMonitorLib.dll index 4c1f31c..1890a5d 100644 Binary files a/dll/LibreHardwareMonitorLib.dll and b/dll/LibreHardwareMonitorLib.dll differ diff --git a/dll/OpenHardwareMonitorLib.dll b/dll/OpenHardwareMonitorLib.dll index e7356fb..d377d98 100644 Binary files a/dll/OpenHardwareMonitorLib.dll and b/dll/OpenHardwareMonitorLib.dll differ