Rewrote "bad" Code to more modern version

[melvin-suter]

As discussed in #100 here is the PR with the rewroten if/else statement.

[ufozone]

approved

[violoncelloCH]

thank you very much for your contribution!
indeed, your changes make sense
however this needs proper testing in different scenarios before merging, but unfortunately I neither have an SMB setup nor enough time to do this at the moment :/

[violoncelloCH]

@ufozone simply "accepting" the PR doesn't really help here, because I don't know what this "accepting" is based on. Instead please test it as much as possible and explain what you tested in detail :)