MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent "confirm squad-disband" from triggering unnecessarily

develop
lethosor 2015-11-11 23:14:30 -05:00
parent e7c3b03ada
commit 07a310b0f2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/confirm.cpp
Unescape Escape View File

@ -405,7 +405,10 @@ class squad_disband_confirmation : public confirmation<df::viewscreen_layer_mili
public: public:
virtual bool intercept_key (df::interface_key key) virtual bool intercept_key (df::interface_key key)
{ {
return screen->num_squads && key == df::interface_key::D_MILITARY_DISBAND_SQUAD; return screen->page == df::viewscreen_layer_militaryst::T_page::Positions &&
screen->num_squads &&
!screen->in_rename_alert &&
key == df::interface_key::D_MILITARY_DISBAND_SQUAD;
} }
virtual string get_id() { return "squad-disband"; } virtual string get_id() { return "squad-disband"; }
virtual string get_title() { return "Disband squad"; } virtual string get_title() { return "Disband squad"; }