X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=nssm.cpp;fp=nssm.cpp;h=6147b90c99689fb62cfac93d469f10801a8826d2;hb=95640f304295257c6d1bb18c806f9d1feb714d61;hp=1f9e0ed1376cfb0cd22b0917a183de6e92c3d8d6;hpb=2d1226f8479378969c42109cfc37becd6306867d;p=nssm.git

diff --git a/nssm.cpp b/nssm.cpp
index 1f9e0ed..6147b90 100644
--- a/nssm.cpp
+++ b/nssm.cpp
@@ -158,8 +158,8 @@ void strip_basename(TCHAR *buffer) {
 
 /* How to use me correctly */
 int usage(int ret) {
-  if (GetConsoleWindow()) print_message(stderr, NSSM_MESSAGE_USAGE, NSSM_VERSION, NSSM_CONFIGURATION, NSSM_DATE);
-  else popup_message(0, MB_OK, NSSM_MESSAGE_USAGE, NSSM_VERSION, NSSM_CONFIGURATION, NSSM_DATE);
+  if ((! GetConsoleWindow() || ! GetStdHandle(STD_OUTPUT_HANDLE)) && GetProcessWindowStation()) popup_message(0, MB_OK, NSSM_MESSAGE_USAGE, NSSM_VERSION, NSSM_CONFIGURATION, NSSM_DATE);
+  else print_message(stderr, NSSM_MESSAGE_USAGE, NSSM_VERSION, NSSM_CONFIGURATION, NSSM_DATE);
   return(ret);
 }