Mercurial > wow > reaction

diff Button.lua @ 279:5b9c0164a491

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed a number of problems with drag corners in config mode - Fixed button resizing via dragging not updating until a reload - Fixed pet/stance/vehicle buttons not always displaying in config mode - Fixed error spam when making too many pet/bag buttons
author Flick
date Wed, 11 May 2011 16:19:17 -0700
parents 4e325f1ea6e1
children 7a9e82c0df15
line wrap: on
line diff
--- a/Button.lua	Wed May 11 11:27:36 2011 -0700
+++ b/Button.lua	Wed May 11 16:19:17 2011 -0700
@@ -188,7 +188,9 @@
         if not success then
           bar:ClipNButtons(n)
           cfgN = n
-          geterrorhandler()(r)
+          if r then
+            geterrorhandler()(r)
+          end
         end
       end
     end
@@ -235,7 +237,8 @@
       end
       if id == nil then
         if unique then
-          error(("All action IDs for bars of type '%s' are in use, cannot create any more buttons"):format(self.config.barType))
+          ReAction:UserError(("All action IDs for bars of type '%s' are in use, cannot create any more buttons"):format(self.barType))
+          error(nil) -- no error message, user has already been notified, so don't put in Lua error handler
         end
         pool.nWraps = nWraps + 1
       end