|
@@ -333,13 +333,22 @@ class AppDelegate: NSObject, NSApplicationDelegate, iRateDelegate{
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- let windowControler = NSApp.mainWindow?.windowController as! KMBrowserWindowController
|
|
|
- if let data = windowControler.browser, data.tabCount() >= 2 { // 有两个以上的标签
|
|
|
+ let windowControler = NSApp.mainWindow?.windowController as? KMBrowserWindowController
|
|
|
+ if let data = windowControler?.browser, data.tabCount() >= 2 { // 有两个以上的标签
|
|
|
if data.activeTabIndex() == 0 { // 主页不允许关闭,暂时处理为无反应
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
- windowControler.browser.closeTab()
|
|
|
+
|
|
|
+ if let browser = windowControler?.browser {
|
|
|
+ if browser.tabCount() == 1 {
|
|
|
+ windowControler?.window?.close()
|
|
|
+ } else {
|
|
|
+ browser.closeTab()
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ windowControler?.window?.close()
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
func applicationShouldOpenUntitledFile(_ sender: NSApplication) -> Bool {
|