Fix crash when reloading config.rb

The previous implementation cached the reactor on the extension instance. However, the instance doesn’t survive the reload and would try to create a new reactor. This failed, because the previous reactor wasn’t stopped.

This change caches the reactor in the ractor class itself so it’s still there after the reload.

Author: benedikt

lib/middleman-livereload/extension_3_1.rb

@@ -25,8 +25,6 @@ def initialize(app, options_hash={}, &block)
         return unless app.environment == :development
       end
 
-      @reactor = nil
-
       port = options.port.to_i
       host = options.host
       js_port = options.js_port || port
@@ -40,11 +38,7 @@ def initialize(app, options_hash={}, &block)
       extension = self
 
       app.ready do
-        if @reactor
-          @reactor.app = self
-        else
-          @reactor = ::Middleman::LiveReload::Reactor.new(options_hash, self)
-        end
+        reactor = ::Middleman::LiveReload::Reactor.create(options_hash, self)
 
         ignored = lambda do |file|
           return true if app.files.respond_to?(:ignored?) && app.files.send(:ignored?, file)
@@ -73,15 +67,15 @@ def initialize(app, options_hash={}, &block)
             reload_path = livereload_css_target
           end
 
-          @reactor.reload_browser(reload_path)
+          reactor.reload_browser(reload_path)
         end
 
         app.files.deleted do |file|
           next if ignored.call(file)
 
           logger.debug "LiveReload: File deleted - #{file}"
 
-          @reactor.reload_browser("#{Dir.pwd}/#{file}")
+          reactor.reload_browser("#{Dir.pwd}/#{file}")
         end
 
         # Use the vendored livereload.js source rather than trying to get it from Middleman

lib/middleman-livereload/reactor.rb

@@ -7,6 +7,16 @@ module LiveReload
     class Reactor
       attr_reader :thread, :web_sockets, :app
 
+      def self.create(options, app)
+        if @reactor
+          @reactor.app = app
+        else
+          @reactor = new(options, app)
+        end
+
+        @reactor
+      end
+
       def initialize(options, app)
         @app = app
         @web_sockets = []