From d46a332218249961f2b9102fc7bc1af685882b8e Mon Sep 17 00:00:00 2001 From: Thibault Jouan Date: Thu, 16 Apr 2015 12:05:51 +0000 Subject: [PATCH] Extract code from Manager#connect as private method --- lib/uh/wm/manager.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/uh/wm/manager.rb b/lib/uh/wm/manager.rb index ce163b6..ff660bb 100644 --- a/lib/uh/wm/manager.rb +++ b/lib/uh/wm/manager.rb @@ -19,9 +19,7 @@ module Uh def connect @events.emit :connecting, args: @display @display.open - Display.on_error { fail OtherWMRunningError } - @display.listen_events INPUT_MASK - @display.sync false + check_other_wm! Display.on_error { |*args| handle_error *args } @display.sync false @events.emit :connected, args: @display @@ -62,6 +60,12 @@ module Uh def handle_error *args @dispatcher.emit :error, args: args end + + def check_other_wm! + Display.on_error { fail OtherWMRunningError } + @display.listen_events INPUT_MASK + @display.sync false + end end end end