Merge pull request petebrowne#11 from mono0x/master

Avoid a "tilt" warning that occurs with a threaded environment
grosser · Mar 3, 2012 · 0b1c738 · 0b1c738
2 parents 6778adb + 219ef72
commit 0b1c738
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/lib/sprockets/sass/sass_template.rb b/lib/sprockets/sass/sass_template.rb
@@ -10,7 +10,7 @@ class SassTemplate < Tilt::SassTemplate
 
       # Templates are initialized once the functions are added.
       def self.engine_initialized?
-        super && defined?(@@sass_functions_added)
+        super && (!Sass.add_sass_functions || defined?(Functions))
       end
 
       # Add the Sass functions if they haven't already been added.
@@ -19,9 +19,6 @@ def initialize_engine
 
         if Sass.add_sass_functions
           require "sprockets/sass/functions"
-          @@sass_functions_added = true
-        else
-          @@sass_functions_added = false
         end
       end