From 1b8d262c4f031207189aa65487626152f32cc993 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Fri, 23 Oct 2009 10:03:02 +0000
Subject: [PATCH] Fix on Windows.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3663 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 windows/JackWinNamedPipeServerChannel.cpp | 19 ++++++++-----------
 windows/JackWinNamedPipeServerChannel.h   | 10 +++++-----
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/windows/JackWinNamedPipeServerChannel.cpp b/windows/JackWinNamedPipeServerChannel.cpp
index 314af9f1..34f5d423 100644
--- a/windows/JackWinNamedPipeServerChannel.cpp
+++ b/windows/JackWinNamedPipeServerChannel.cpp
@@ -53,7 +53,14 @@ JackClientPipeThread::~JackClientPipeThread()
 int JackClientPipeThread::Open(JackServer* server)	// Open the Server/Client connection
 {
     fServer = server;
-    return 0;
+    
+    // Start listening
+    if (fThread.Start() != 0) {
+        jack_error("Cannot start Jack server listener\n");
+        return -1;
+    } else {
+        return 0;
+    }
 }
 
 void JackClientPipeThread::Close()					// Close the Server/Client connection
@@ -70,16 +77,6 @@ void JackClientPipeThread::Close()					// Close the Server/Client connection
     fRefNum = -1;
 }
     
-int JackClientPipeThread::Start()
-{
-    if (fThread.Start() != 0) {
-        jack_error("Cannot start Jack server listener");
-        return -1;
-    }  
-    
-    return 0;
-}    
-
 bool JackClientPipeThread::Execute()
 {
     jack_log("JackClientPipeThread::Execute");
diff --git a/windows/JackWinNamedPipeServerChannel.h b/windows/JackWinNamedPipeServerChannel.h
index 07d5abc9..7404f04d 100644
--- a/windows/JackWinNamedPipeServerChannel.h
+++ b/windows/JackWinNamedPipeServerChannel.h
@@ -52,9 +52,7 @@ class JackClientPipeThread : public JackRunnableInterface
 
         int Open(JackServer* server);   // Open the Server/Client connection
         void Close();                   // Close the Server/Client connection
-    
-        int Start();
-
+   
         bool HandleRequest();
 
         // JackRunnableInterface interface
@@ -90,8 +88,10 @@ class JackWinNamedPipeServerChannel : public JackRunnableInterface
         JackWinNamedPipeServerChannel();
         ~JackWinNamedPipeServerChannel();
 
-        int Open(const char* server_name, JackServer* server);	// Open the Server/Client connection
-        void Close();					// Close the Server/Client connection
+        int Open(const char* server_name, JackServer* server);  // Open the Server/Client connection
+        void Close();                                           // Close the Server/Client connection
+    
+        int Start();
 
         // JackRunnableInterface interface
         bool Init();