You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2017/10/27 18:32:05 UTC

svn commit: r1813555 - in /commons/proper/daemon/trunk/src: changes/changes.xml native/windows/apps/prunmgr/prunmgr.c

Author: markt
Date: Fri Oct 27 18:32:05 2017
New Revision: 1813555

URL: http://svn.apache.org/viewvc?rev=1813555&view=rev
Log:
Fix DAEMON-312. Ensure //MQ closes prunmgr.

Modified:
    commons/proper/daemon/trunk/src/changes/changes.xml
    commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c

Modified: commons/proper/daemon/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/changes/changes.xml?rev=1813555&r1=1813554&r2=1813555&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/changes/changes.xml (original)
+++ commons/proper/daemon/trunk/src/changes/changes.xml Fri Oct 27 18:32:05 2017
@@ -111,6 +111,10 @@
         Ensure that procun treats JVM crashes as service failures so the
         recovery options will apply.
       </action>
+      <action issue="DAEMON-312" type="fix" dev="markt">
+        Ensure that the //MQ command closes the prunmgr process even if the 
+        configuration dialog is open when the //MQ command is used.
+      </action>
     </release>
   </body>
 </document>

Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c?rev=1813555&r1=1813554&r2=1813555&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c Fri Oct 27 18:32:05 2017
@@ -1595,6 +1595,11 @@ LRESULT CALLBACK MainWndProc(HWND hWnd,
         case WM_DESTROY:
             if (bEnableTry)
                 apxManageTryIconA(hWnd, NIM_DELETE, NULL, NULL, NULL);
+            /* Setting this to false ensures that the process closes down
+             * cleanly when the configuration window is open and the process
+             * is closed via MQ,
+             */
+            bEnableTry = FALSE;
             PostQuitMessage(0);
         break;
         default: