Merge branch 'master' of ssh://ruby-rbot.org/var/git/rbot

[user/henk/code/ruby/rbot.git] / lib / rbot / ircbot.rb

diff --git a/lib/rbot/ircbot.rb b/lib/rbot/ircbot.rb
index 42e3c9b6e801d7d9d805fc313aa610b9a513dc27..f15cb351807aa18f06c993fb2da13d49e4f1a23e 100644 (file)
--- a/lib/rbot/ircbot.rb
+++ b/lib/rbot/ircbot.rb
@@ -1042,12 +1042,16 @@ class Bot
   def disconnect(message=nil)
     message = @lang.get("quit") if (!message || message.empty?)
     if @socket.connected?
-      debug "Clearing socket"
-      @socket.clearq
-      debug "Sending quit message"
-      @socket.emergency_puts "QUIT :#{message}"
-      debug "Flushing socket"
-      @socket.flush
+      begin
+        debug "Clearing socket"
+        @socket.clearq
+        debug "Sending quit message"
+        @socket.emergency_puts "QUIT :#{message}"
+        debug "Flushing socket"
+        @socket.flush
+      rescue SocketError => e
+        error "error while disconnecting socket: #{e.pretty_inspect}"
+      end
       debug "Shutting down socket"
       @socket.shutdown
     end