allow it to work on windows [did it ever work on linux?] and also all…

…ow it to work if outside a process that has already run IRB.
pete · Jul 9, 2009 · e4768da · e4768da
1 parent 3ae0eb7
commit e4768da
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/live_console.rb b/lib/live_console.rb
@@ -137,9 +137,9 @@ def IRB.start_with_io(io, bind, &block)
 			@inited = true
 		end
 
-		bind ||= IRB::Frame.top(1)
 		ws = IRB::WorkSpace.new(bind)
 		irb = Irb.new(ws, io, io)
+		bind ||= IRB::Frame.top(1) rescue TOPLEVEL_BINDING
 
 		@CONF[:IRB_RC].call(irb.context) if @CONF[:IRB_RC]
 		@CONF[:MAIN_CONTEXT] = irb.context

diff --git a/lib/live_console/io_methods/socket_io.rb b/lib/live_console/io_methods/socket_io.rb
@@ -10,7 +10,7 @@ def start
 		@server ||= TCPServer.new host, port
 
 		begin
-			self.raw_input = self.raw_output = server.accept_nonblock
+			self.raw_input = self.raw_output = server.accept
 			return true
 		rescue Errno::EAGAIN, Errno::ECONNABORTED, Errno::EPROTO,
 			   Errno::EINTR => e