Fixed modify window deleting changes

and crash on backing out of QR scanner