[commons-daemon] branch master updated: Procrun. Fix DAEMON-407. Correct log-level mix-up in GUI

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git


The following commit(s) were added to refs/heads/master by this push:
     new b979c79  Procrun. Fix DAEMON-407. Correct log-level mix-up in GUI
b979c79 is described below

commit b979c7923ad4b02941026adc47574e4c868e0fda
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Sep 4 11:12:06 2019 +0100

    Procrun. Fix DAEMON-407. Correct log-level mix-up in GUI
---
 src/changes/changes.xml                   | 4 ++++
 src/native/windows/apps/prunmgr/prunmgr.c | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 6ce7717..eb5e620 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -46,6 +46,10 @@
         Procrun. Correct a regression in the previous fix for this issue that
         caused 32-bit services to crash on start-up.
       </action> 
+      <action issue="DAEMON-407" type="fix" dev="markt">
+        Procrun. Correct a regression in the fix for DAEMON-391 that caused the
+        GUI to mix-up the WARN and INFO logging levels. 
+      </action>
     </release>
     <release version="1.2.0" date="2019-06-28" description="Feature and bug 
fix release">
       <action type="fix" dev="markt" due-to="mturk" >
diff --git a/src/native/windows/apps/prunmgr/prunmgr.c 
b/src/native/windows/apps/prunmgr/prunmgr.c
index 82461f0..fd95466 100644
--- a/src/native/windows/apps/prunmgr/prunmgr.c
+++ b/src/native/windows/apps/prunmgr/prunmgr.c
@@ -950,16 +950,16 @@ LRESULT CALLBACK __loggingProperty(HWND hDlg,
                                                _s_log, L"Level")) != NULL) {
                     if (!lstrcmpiW(b, LOGL_ERROR))
                         ComboBox_SetCurSel(GetDlgItem(hDlg, IDC_PPLGLEVEL), 0);
-                    else if (!lstrcmpiW(b, LOGL_INFO))
-                        ComboBox_SetCurSel(GetDlgItem(hDlg, IDC_PPLGLEVEL), 1);
                     else if (!lstrcmpiW(b, LOGL_WARN))
+                        ComboBox_SetCurSel(GetDlgItem(hDlg, IDC_PPLGLEVEL), 1);
+                    else if (!lstrcmpiW(b, LOGL_INFO))
                         ComboBox_SetCurSel(GetDlgItem(hDlg, IDC_PPLGLEVEL), 2);
                     else
                         ComboBox_SetCurSel(GetDlgItem(hDlg, IDC_PPLGLEVEL), 3);
                     apxFree(b);
                 }
                 else
-                    ComboBox_SetCurSel(GetDlgItem(hDlg, IDC_PPLGLEVEL), 1);
+                    ComboBox_SetCurSel(GetDlgItem(hDlg, IDC_PPLGLEVEL), 2);
                 if ((b = apxRegistryGetStringW(hRegserv, APXREG_PARAMSOFTWARE,
                                                _s_log, L"Path")) != NULL) {
                     SetDlgItemTextW(hDlg, IDC_PPLGPATH, b);