diff ReAction.lua @ 258:a7d2efb6ffc9 stable

Merge 1.1 beta 5 to stable
author Flick
date Tue, 12 Apr 2011 16:07:21 -0700
parents 9e708a155ab9
children 36a29870bf34
line wrap: on
line diff
--- a/ReAction.lua	Tue Apr 12 16:06:31 2011 -0700
+++ b/ReAction.lua	Tue Apr 12 16:07:21 2011 -0700
@@ -228,8 +228,10 @@
     config.x          = config.x or 0
   else
     config = config or profile.bars[name] or { }
-    if not config or not config.type or not self.barTypes[config.type] then
-      error(("ReAction: Unable to construct/fetch config table for bar '%s'"):format(name))
+    if not config then
+      error(("ReAction: Unable to fetch config table for bar '%s'"):format(name))
+    elseif not config.type or not self.barTypes[config.type] then
+      error(("ReAction: Unrecognized bar type '%s' for bar '%s'"):format(tostring(config.type), name))
     end
     class = self.barTypes[config.type]
   end