Skip to content

Commit 34bb8e6

Browse files
committed
버그 수정, 리팩토링
1. \n이 2번 출력되는 문제 해결 2. 모듈을 로드하지 않고 종료할 때, freeLibrary 호출 안함. 3. 불필요 괄호 삭제.
1 parent 650d3cd commit 34bb8e6

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

SamFirm/Command.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public static Firmware UpdateCheck(string model, string region, string pda, stri
109109
{
110110
Logger.WriteLog("LogicValue: " + firmware.LogicValueHome);
111111
}
112-
Logger.WriteLog("\n");
112+
Logger.WriteLog("");
113113
return firmware;
114114
}
115115

SamFirm/Form1.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ private void InitializeComponent()
303303
this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
304304
this.groupBox3.Name = "groupBox3";
305305
this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
306-
this.groupBox3.Size = new System.Drawing.Size(333, 103);
306+
this.groupBox3.Size = new System.Drawing.Size(333, 107);
307307
this.groupBox3.TabIndex = 17;
308308
this.groupBox3.TabStop = false;
309309
//
@@ -826,6 +826,7 @@ private void Update_button_Click(object sender, EventArgs e)
826826
return;
827827
}
828828

829+
//백그라운드 작업 등록
829830
BackgroundWorker worker = new BackgroundWorker();
830831
worker.DoWork += delegate (object o, DoWorkEventArgs _e)
831832
{
@@ -864,7 +865,7 @@ private void Update_button_Click(object sender, EventArgs e)
864865
this.version_textbox.Invoke(invoker2);
865866
if (invoker3 == null)
866867
{
867-
invoker3 = () => this.size_textbox.Text = ((long.Parse(this.FW.Size) / 0x400L) / 0x400L) + " MB";
868+
invoker3 = () => this.size_textbox.Text = (long.Parse(this.FW.Size) / 0x400L / 0x400L) + " MB";
868869
}
869870
this.size_textbox.Invoke(invoker3);
870871
}
@@ -894,6 +895,8 @@ private void Update_button_Click(object sender, EventArgs e)
894895
Logger.WriteLog(exception.ToString());
895896
}
896897
};
898+
899+
//백그라운드 작업 실행
897900
worker.RunWorkerAsync();
898901
}
899902

SamFirm/Imports.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,14 @@ internal class Imports
2020
private static extern bool FreeLibrary(IntPtr hModule);
2121
public static void FreeModule()
2222
{
23-
if (!FreeLibrary(mod))
23+
if (mod != IntPtr.Zero)
2424
{
25-
Logger.WriteLog("Error: Unable to free library");
25+
if (!FreeLibrary(mod))
26+
{
27+
Logger.WriteLog("Error: Unable to free library");
28+
}
29+
mod = IntPtr.Zero;
2630
}
27-
mod = IntPtr.Zero;
2831
}
2932

3033
//권한을 얻는 메소드

0 commit comments

Comments
 (0)