I think this is fixed in BF6.

Quick swap from primary to secondary weapon using the mouse wheel.  Is it fixed on BF6.  I know in 2042 it switches to a gadget and I end up dying lol.

I don't think I experienced this in BF6, pretty sure i quick swapped halfway through reloading. 

Maybe there is a setting or something I could set.

Cheers

Billdukes