Merge pull request #5518 from ckamm/asserts

Improve usage of asserts

diff --cc src/gui/socketapi.cpp
Simple merge

diff --cc src/libsync/discoveryphase.cpp
Simple merge

diff --cc src/libsync/syncengine.cpp
Simple merge