Skip to content

Commit 2df565e

Browse files
committed
Bugfixes on Logging functionnality
Since the logging was improved, the view / delete functions of the current log file no longer pointed to the correct files. This error has been corrected.
1 parent 364e513 commit 2df565e

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

WinNUT_V2/Setup/Setup.vdproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5624,22 +5624,22 @@
56245624
{
56255625
"Name" = "8:Microsoft Visual Studio"
56265626
"ProductName" = "8:WinNUT"
5627-
"ProductCode" = "8:{C92CB539-2108-48B7-81C5-AD52CA52A030}"
5628-
"PackageCode" = "8:{8BF31541-B746-48D0-8D6E-49FD77B32651}"
5627+
"ProductCode" = "8:{1203E947-5DE0-4661-BA8E-DA6343971CEC}"
5628+
"PackageCode" = "8:{EC53C4C3-7855-4625-A4F8-58D955868905}"
56295629
"UpgradeCode" = "8:{7EA17151-76E7-4E29-8F6A-621C1B4144C2}"
56305630
"AspNetVersion" = "8:2.0.50727.0"
56315631
"RestartWWWService" = "11:FALSE"
56325632
"RemovePreviousVersions" = "11:TRUE"
56335633
"DetectNewerInstalledVersion" = "11:FALSE"
56345634
"InstallAllUsers" = "11:FALSE"
5635-
"ProductVersion" = "8:2.0.7716"
5635+
"ProductVersion" = "8:2.0.7721"
56365636
"Manufacturer" = "8:Gawindx"
56375637
"ARPHELPTELEPHONE" = "8:"
56385638
"ARPHELPLINK" = "8:https://github.com/gawindx/WinNUT-Client/issues"
56395639
"Title" = "8:WinNUT-Setup"
5640-
"Subject" = "8:WinNUT-Client v2.0.7716"
5640+
"Subject" = "8:WinNUT-Client v2.0.7721"
56415641
"ARPCONTACT" = "8:Gawindx"
5642-
"Keywords" = "8:WinNUT v2.0.7716"
5642+
"Keywords" = "8:WinNUT v2.0.7721"
56435643
"ARPCOMMENTS" = "8:Windows NUT Client"
56445644
"ARPURLINFOABOUT" = "8:"
56455645
"ARPPRODUCTICON" = "8:_33BCB1EF059B4E9B87FA7435A8F2499C"

WinNUT_V2/WinNUT_GUI/Logger.vb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ Public Class Logger
4242
Me.LogFile.Location = LogFileLocation.Custom
4343
Me.LogFile.CustomLocation = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\WinNUT-Client"
4444
Me.LastEventsList.Capacity = 50
45+
WinNUT_Globals.LogFilePath = Me.LogFile.FullLogFileName
4546
End Sub
4647

4748
Public Property WriteLog() As Boolean
@@ -71,6 +72,9 @@ Public Class Logger
7172
Dim EventTime = Now.ToLocalTime
7273
Dim FinalMsg = EventTime & " Pid: " & Pid & " " & SenderName & " : " & message
7374

75+
'Update LogFilePath to make sure it's still the correct path
76+
WinNUT_Globals.LogFilePath = Me.LogFile.FullLogFileName
77+
7478
' Always write log messages to the attached debug messages window.
7579
#If DEBUG Then
7680
Debug.WriteLine(FinalMsg)

WinNUT_V2/WinNUT_GUI/WinNUT_Globals.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Module WinNUT_Globals
2828
GitHubURL = My.Application.Info.Trademark
2929
Copyright = My.Application.Info.Copyright
3030
Directory_AppData = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\WinNUT-Client"
31-
LogFilePath = Directory_AppData & "\WinNUT-CLient.log"
31+
3232
If Not System.IO.Directory.Exists(Directory_AppData) Then
3333
My.Computer.FileSystem.CreateDirectory(Directory_AppData)
3434
End If

0 commit comments

Comments
 (0)