Fix window bug

Merged Wang Yuyang requested to merge Fix_window_bug into master

Merge request reports