Update mainwindow.cpp
Merge remote-tracking branch 'upstream/master'