Fix many Waitingmenu bugs

Signed-off-by: Andre Schweiger <andre.spiele@yahoo.de>
Fix infinite loop self overiding the waitmenu

Signed-off-by: Andre Schweiger <andre.spiele@yahoo.de>