Merge remote-tracking branch 'qiuyuzhou/develop' into develop

This commit is contained in:
qinyuhang
2016-08-25 12:58:40 +08:00
@@ -124,6 +124,7 @@ class PreferencesWindowController: NSWindowController
@IBAction func ok(sender: NSButton) {
if editingProfile != nil {
if !editingProfile.isValid() {
// Done Shake window
shakeWindows()
return
}