diff --git a/ChangeLog b/ChangeLog
index 0b27a7b4..3dda22db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
   Jackdmp changes log
 ---------------------------
 
+2006-10-11 Stephane Letz  <letz@grame.fr>
+
+	* Correct server SetBufferSize in case of failure.
+
 2006-10-06 Stephane Letz  <letz@grame.fr>
 
 	* Add a new cpu testing/loading client.
diff --git a/common/JackServer.cpp b/common/JackServer.cpp
index e1a069ec..6c9004d1 100644
--- a/common/JackServer.cpp
+++ b/common/JackServer.cpp
@@ -214,36 +214,6 @@ int JackServer::Deactivate(int refnum)
     return res;
 }
 
-/*
-int JackServer::SetBufferSize(jack_nframes_t nframes)
-{
-    JackLog("JackServer::SetBufferSize nframes = %ld\n", nframes);
-
-    if (nframes > BUFFER_SIZE_MAX)
-        return -1;
-
-    if (fAudioDriver->Stop() != 0) {
-        jack_error("Cannot stop audio driver");
-        return -1;
-    }
-
-    if (fAudioDriver->SetBufferSize(nframes) != 0) {
-        jack_error("Cannot SetBufferSize for audio driver");
-        return -1;
-    }
-
-    if (fFreewheelDriver->SetBufferSize(nframes) != 0) {
-        jack_error("Cannot SetBufferSize for freewheel driver");
-        return -1;
-    }
-
-    fEngine->NotifyBufferSize(nframes);
-
-    fEngineControl->fFrameTimer.Init();
-    return fAudioDriver->Start();
-}
-*/
-
 int JackServer::SetBufferSize(jack_nframes_t buffer_size)
 {
     JackLog("JackServer::SetBufferSize nframes = %ld\n", buffer_size);