Fixed behavior on Rubinius.

ShogunPanda-archive · Apr 6, 2014 · b417521 · b417521
1 parent e54e8bb
commit b417521
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -6,6 +6,7 @@
 [![Code Climate](https://codeclimate.com/github/ShogunPanda/clavem.png)](https://codeclimate.com/github/ShogunPanda/clavem)
 [![Coverage Status](https://coveralls.io/repos/ShogunPanda/clavem/badge.png)](https://coveralls.io/r/ShogunPanda/clavem)
 [![Bitdeli Trend](https://d2weczhvl823v0.cloudfront.net/ShogunPanda/clavem/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+<iframe src="http://ghbtns.com/github-btn.html?user=ShogunPanda&repo=clavem&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="135" height="20"></iframe>
 
 A local callback server for oAuth web-flow.
 

diff --git a/lib/clavem/authorizer.rb b/lib/clavem/authorizer.rb
@@ -187,7 +187,7 @@ def process_response
             Clavem::Server.new(self)
           end
 
-          server.join(@timeout > 0 ? @timeout : nil)
+          @timeout > 0 ? server.join(@timeout) : server.join
         rescue Interrupt
           raise Clavem::Exceptions::Failure.new(@i18n.errors.interrupted)
         end