Fix re-enabling autobutcher after being disabled.

develop
Alexander Gavrilov 2012-10-06 12:51:34 +04:00
parent 5396a67465
commit 6fefd09072
2 changed files with 5 additions and 1 deletions

@ -2,6 +2,8 @@ DFHack future
Internals: Internals:
- support for displaying active keybindings properly. - support for displaying active keybindings properly.
Notable bugfixes:
- autobutcher can be re-enabled again after being stopped.
Misc improvements: Misc improvements:
- fastdwarf: new mode using debug flags, and some internal consistency fixes. - fastdwarf: new mode using debug flags, and some internal consistency fixes.

@ -3408,10 +3408,10 @@ command_result start_autobutcher(color_ostream &out)
auto pworld = Core::getInstance().getWorld(); auto pworld = Core::getInstance().getWorld();
enable_autobutcher = true; enable_autobutcher = true;
if (!config_autobutcher.isValid()) if (!config_autobutcher.isValid())
{ {
config_autobutcher = pworld->AddPersistentData("autobutcher/config"); config_autobutcher = pworld->AddPersistentData("autobutcher/config");
config_autobutcher.ival(0) = enable_autobutcher;
config_autobutcher.ival(1) = sleep_autobutcher; config_autobutcher.ival(1) = sleep_autobutcher;
config_autobutcher.ival(2) = enable_autobutcher_autowatch; config_autobutcher.ival(2) = enable_autobutcher_autowatch;
config_autobutcher.ival(3) = default_fk; config_autobutcher.ival(3) = default_fk;
@ -3420,6 +3420,8 @@ command_result start_autobutcher(color_ostream &out)
config_autobutcher.ival(6) = default_ma; config_autobutcher.ival(6) = default_ma;
} }
config_autobutcher.ival(0) = enable_autobutcher;
out << "Starting autobutcher." << endl; out << "Starting autobutcher." << endl;
init_autobutcher(out); init_autobutcher(out);
return CR_OK; return CR_OK;