Merge pull request #6544 from spycrab/qt_fix_general GeneralPane: Fix settings resetting and improve code
