FIX reordering while saving twice

@dengemann: does this address https://github.com/mne-tools/mne-python/issues/1446 ?

I'll add the warnings once you confirm if it works.