TTSD-39500

In some cases, an active drawing command was not correctly finished when you closed the drawing mode, causing crashes and other invalid behavior. This has now been fixed.