Skip to content

Commit b3129ff

Browse files
committed
Fixed settings bug in Syslog UDP reveiver
1 parent cc27043 commit b3129ff

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

src/GuiLibrary/GuiLibrary.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,7 @@
103103
<Compile Include="Interop\Win32.cs" />
104104
<Compile Include="Properties\AssemblyInfo.cs" />
105105
</ItemGroup>
106-
<ItemGroup>
107-
<Folder Include="Controls\Debug\" />
108-
</ItemGroup>
106+
<ItemGroup />
109107
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
110108
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
111109
Other similar extension points exist, see Microsoft.Common.targets.

src/Logbert/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
// Build Number
3030
// Revision
3131
//
32-
[assembly: AssemblyVersion("1.4.1.0")]
33-
[assembly: AssemblyFileVersion("1.4.1.0")]
32+
[assembly: AssemblyVersion("1.4.2.0")]
33+
[assembly: AssemblyFileVersion("1.4.2.0")]
3434
[assembly: NeutralResourcesLanguageAttribute("")]

src/Logbert/Receiver/SyslogUdpReceiver/SyslogUdpReceiverSettings.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ protected override void OnLoad(EventArgs e)
233233
nudPort.Value = Settings.Default.PnlSyslogSettingsPort;
234234
txtMulticastIp.Text = Settings.Default.PnlSyslogSettingsMulticastAddress;
235235
chkMulticastGroup.Checked = Settings.Default.PnlSyslogSettingsJoinMulticast;
236-
txtTimestampFormat.Text = Settings.Default.PnlSyslogFileSettingsTimestampFormat;
236+
txtTimestampFormat.Text = Settings.Default.PnlSyslogUdpSettingsTimestampFormat;
237237
}
238238
}
239239

@@ -334,10 +334,11 @@ public ILogProvider GetConfiguredInstance()
334334
if (ModifierKeys != Keys.Shift)
335335
{
336336
// Save the current settings as new default values.
337-
Settings.Default.PnlSyslogSettingsInterface = cmbNetworkInterface.SelectedItem.ToString();
338-
Settings.Default.PnlSyslogSettingsPort = (int)nudPort.Value;
339-
Settings.Default.PnlSyslogSettingsJoinMulticast = chkMulticastGroup.Checked;
340-
Settings.Default.PnlSyslogSettingsMulticastAddress = txtMulticastIp.Text;
337+
Settings.Default.PnlSyslogSettingsInterface = cmbNetworkInterface.SelectedItem.ToString();
338+
Settings.Default.PnlSyslogSettingsPort = (int)nudPort.Value;
339+
Settings.Default.PnlSyslogSettingsJoinMulticast = chkMulticastGroup.Checked;
340+
Settings.Default.PnlSyslogSettingsMulticastAddress = txtMulticastIp.Text;
341+
Settings.Default.PnlSyslogUdpSettingsTimestampFormat = txtTimestampFormat.Text;
341342

342343
Settings.Default.SaveSettings();
343344
}
@@ -346,7 +347,7 @@ public ILogProvider GetConfiguredInstance()
346347
? IPAddress.Parse(txtMulticastIp.Text.Trim())
347348
: null
348349
, new IPEndPoint(ipAddress.Address, (int)nudPort.Value)
349-
, Settings.Default.PnlSyslogUdpSettingsTimestampFormat);
350+
, txtTimestampFormat.Text);
350351
}
351352
}
352353
}

0 commit comments

Comments
 (0)