From d4dd32fce106e1a434b1efb095630cce4dba71b5 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Tue, 3 Jan 2012 16:45:21 +0000
Subject: [PATCH] Cleanup.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4660 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 ChangeLog                                 |  2 +-
 windows/JackWinNamedPipe.cpp              | 24 +++++++++++------------
 windows/JackWinNamedPipeServerChannel.cpp |  2 +-
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a7bb633e..cdd6ae66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,7 +38,7 @@ John Emmas
 
 2012-01-01 Stephane Letz  <letz@grame.fr>
 
-	* Fix in midiseq.c.
+	* Adrian Knoth fix in midiseq.c.
 
 2011-12-20 Stephane Letz  <letz@grame.fr>
 
diff --git a/windows/JackWinNamedPipe.cpp b/windows/JackWinNamedPipe.cpp
index 8d277673..aefc22b3 100644
--- a/windows/JackWinNamedPipe.cpp
+++ b/windows/JackWinNamedPipe.cpp
@@ -290,9 +290,9 @@ bool JackWinNamedPipeServer::Accept()
     if (ConnectNamedPipe(fNamedPipe, NULL)) {
         return true;
     } else {
-        jack_error("Cannot bind server pipe name = %s err = %ld", fName, GetLastError());
+        jack_error("Cannot connect server pipe name = %s err = %ld", fName, GetLastError());
         if (GetLastError() == ERROR_PIPE_CONNECTED) {
-            jack_error("pipe already connnected = %s ", fName);
+            jack_error("Pipe already connnected = %s", fName);
             return true;
         } else {
             return false;
@@ -303,20 +303,18 @@ bool JackWinNamedPipeServer::Accept()
 JackWinNamedPipeClient* JackWinNamedPipeServer::AcceptClient()
 {
     if (ConnectNamedPipe(fNamedPipe, NULL)) {
-        JackWinNamedPipeClient* client = new JackWinNamedPipeClient(fNamedPipe, fName);
         // Init the pipe to the default value
         fNamedPipe = INVALID_HANDLE_VALUE;
-        return client;
+        return new JackWinNamedPipeClient(fNamedPipe, fName);;
     } else {
-        switch (GetLastError()) {
-
-            case ERROR_PIPE_CONNECTED:
-                return new JackWinNamedPipeClient(fNamedPipe, fName);
-
-            default:
-                jack_error("Cannot connect server pipe name = %s  err = %ld", fName, GetLastError());
-                return NULL;
-                break;
+        jack_error("Cannot connect server pipe name = %s err = %ld", fName, GetLastError());
+        if (GetLastError() == ERROR_PIPE_CONNECTED) {
+            jack_error("Pipe already connnected = %s", fName);
+            // Init the pipe to the default value
+            fNamedPipe = INVALID_HANDLE_VALUE;
+            return new JackWinNamedPipeClient(fNamedPipe, fName);
+        } else {
+            return NULL;
         }
     }
 }
diff --git a/windows/JackWinNamedPipeServerChannel.cpp b/windows/JackWinNamedPipeServerChannel.cpp
index cf95b36b..b995fdfd 100644
--- a/windows/JackWinNamedPipeServerChannel.cpp
+++ b/windows/JackWinNamedPipeServerChannel.cpp
@@ -507,7 +507,7 @@ void JackWinNamedPipeServerChannel::Stop()
 
 bool JackWinNamedPipeServerChannel::Init()
 {
-    jack_log("JackWinNamedPipeServerChannel::Init ");
+    jack_log("JackWinNamedPipeServerChannel::Init");
     JackWinNamedPipeClient* pipe;
 
     // Accept first client, that is the JackWinNamedPipeServerNotifyChannel object