Unit count changes are not automatically saved before attacking

Currently there is no automatic save of unit count changes when attacking with general. This results in a situation where the units displayed are not the units going to attack (if you changed unit counts and did not click OK). The same issue applies to combat preview.

Sorry if this is a double post but I did not find anything similar reported.

If it would be automatically saved, why would there be an ok and cancel button?

But it might be good if the attack buttons are disabled when the shown unit count isn't saved, or even better if the ok and cancel buttons are removed and each change is indeed automatically saved. (However this probably introduces performance issues)