버그 수정, 리팩토링

1. \n이 2번 출력되는 문제 해결 2. 모듈을 로드하지 않고 종료할 때, freeLibrary 호출 안함. 3. 불필요 괄호 삭제.
synml · Jan 23, 2019 · 34bb8e6 · 34bb8e6
1 parent 650d3cd
commit 34bb8e6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/SamFirm/Command.cs b/SamFirm/Command.cs
@@ -109,7 +109,7 @@ public static Firmware UpdateCheck(string model, string region, string pda, stri
             {
                 Logger.WriteLog("LogicValue: " + firmware.LogicValueHome);
             }
-            Logger.WriteLog("\n");
+            Logger.WriteLog("");
             return firmware;
         }
 

diff --git a/SamFirm/Form1.cs b/SamFirm/Form1.cs
@@ -303,7 +303,7 @@ private void InitializeComponent()
             this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.groupBox3.Name = "groupBox3";
             this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.groupBox3.Size = new System.Drawing.Size(333, 103);
+            this.groupBox3.Size = new System.Drawing.Size(333, 107);
             this.groupBox3.TabIndex = 17;
             this.groupBox3.TabStop = false;
             // 
@@ -826,6 +826,7 @@ private void Update_button_Click(object sender, EventArgs e)
                 return;
             }
 
+            //백그라운드 작업 등록
             BackgroundWorker worker = new BackgroundWorker();
             worker.DoWork += delegate (object o, DoWorkEventArgs _e)
             {
@@ -864,7 +865,7 @@ private void Update_button_Click(object sender, EventArgs e)
                         this.version_textbox.Invoke(invoker2);
                         if (invoker3 == null)
                         {
-                            invoker3 = () => this.size_textbox.Text = ((long.Parse(this.FW.Size) / 0x400L) / 0x400L) + " MB";
+                            invoker3 = () => this.size_textbox.Text = (long.Parse(this.FW.Size) / 0x400L / 0x400L) + " MB";
                         }
                         this.size_textbox.Invoke(invoker3);
                     }
@@ -894,6 +895,8 @@ private void Update_button_Click(object sender, EventArgs e)
                     Logger.WriteLog(exception.ToString());
                 }
             };
+
+            //백그라운드 작업 실행
             worker.RunWorkerAsync();
         }
 

diff --git a/SamFirm/Imports.cs b/SamFirm/Imports.cs
@@ -20,11 +20,14 @@ internal class Imports
         private static extern bool FreeLibrary(IntPtr hModule);
         public static void FreeModule()
         {
-            if (!FreeLibrary(mod))
+            if (mod != IntPtr.Zero)
             {
-                Logger.WriteLog("Error: Unable to free library");
+                if (!FreeLibrary(mod))
+                {
+                    Logger.WriteLog("Error: Unable to free library");
+                }
+                mod = IntPtr.Zero;
             }
-            mod = IntPtr.Zero;
         }
 
         //권한을 얻는 메소드