zhangyuheng/ClashX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Crash due to force unwrap option value

Browse Source
This commit is contained in:
yicheng 2018-08-06 16:54:41 +08:00
parent 2b7a332af5
commit e0566fd154
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ClashX/AppDelegate.swift
View File

@ -67,10 +67,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
ConfigManager.shared
.showNetSpeedIndicatorObservable
.bind {[unowned self] (show) in
self.showNetSpeedIndicatorMenuItem.state = (show!) ? .on : .off
self.statusItem = NSStatusBar.system.statusItem(withLength: show! ? 57 : 22)
self.showNetSpeedIndicatorMenuItem.state = (show ?? true) ? .on : .off
self.statusItem = NSStatusBar.system.statusItem(withLength: (show ?? true) ? 57 : 22)
self.statusItem.view = self.statusItemView
self.statusItemView.showSpeedContainer(show: show!)
self.statusItemView.showSpeedContainer(show: (show ?? true))
self.statusItemView.statusItem = self.statusItem
}.disposed(by: disposeBag)
@ -78,10 +78,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
.proxyPortAutoSetObservable
.distinctUntilChanged()
.bind{ [unowned self]
enable in
self.proxySettingMenuItem.state = (enable ?? false) ? .on : .off
en in
let enable = en ?? false
self.proxySettingMenuItem.state = enable ? .on : .off
let image =
NSImage(named: NSImage.Name(rawValue: "menu_icon"))!.tint(color: enable! ? NSColor.black : NSColor.gray)
NSImage(named: NSImage.Name(rawValue: "menu_icon"))!.tint(color: enable ? NSColor.black : NSColor.gray)
((self.statusItem.view) as! StatusItemView).imageView.image = image
}.disposed(by: disposeBag)

2
ClashX/Info.plist
View File

@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<string>1.1</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>LSUIElement</key>