Merge remote-tracking branch 'putnam/patch-3'

2014-09-16 16:55:48 -04:00 · 2014-09-16 16:55:48 -04:00 · 39bfe71453
parent 3e882f35b3 a30780420b
commit 39bfe71453
1 changed files with 5 additions and 1 deletions
--- a/scripts/gui/hack-wish.lua
+++ b/scripts/gui/hack-wish.lua
@ -214,7 +214,11 @@ eventful=require('plugins.eventful')

 if not args.startup then 
 local unit=args.unit and df.unit.find(args.unit) or dfhack.gui.getSelectedUnit(true)
- hackWish(unit)
+ if unit then
+  hackWish(unit)
+ else
+  qerror('A unit needs to be selected to use hackwish.')
+ end
 else
 eventful.onReactionComplete.hackWishP=function(reaction,unit,input_items,input_reagents,output_items,call_native)
  if not reaction.code:find('DFHACK_WISH') then return nil end