morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-14 00:04:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix crash on start (the problem with self.window in popup)

Browse Source 
- fix crash when missing wifi network name
This commit is contained in:
Serhiy Mytrovtsiy
2020-06-29 16:56:39 +02:00
parent e061a81723
commit 0f8e9ea739
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ModuleKit/Widgets/popup.swift
View File

@@ -71,7 +71,7 @@ internal class Popup: NSView {
values.forEach { (s: Sensor_t) in
if self.list[s.key] != nil {
DispatchQueue.main.async(execute: {
if self.window!.isVisible {
if (self.window?.isVisible ?? false) {
self.list[s.key]?.stringValue = s.formattedValue
}
})

4
Modules/CPU/popup.swift
View File

@@ -99,7 +99,7 @@ internal class Popup: NSView {
var temperature: String = "Unknown"
DispatchQueue.main.async(execute: {
if self.window!.isVisible || !self.ready {
if (self.window?.isVisible ?? false) || !self.ready {
if tempValue != nil {
let formatter = MeasurementFormatter()
let measurement = Measurement(value: tempValue!.rounded(toPlaces: 0), unit: UnitTemperature.celsius)
@@ -107,7 +107,7 @@ internal class Popup: NSView {
}
self.temperatureField?.stringValue = temperature
self.systemField?.stringValue = "\(Int(value.systemLoad.rounded(toPlaces: 2) * 100)) %"
self.userField?.stringValue = "\(Int(value.userLoad.rounded(toPlaces: 2) * 100)) %"
self.idleField?.stringValue = "\(Int(value.idleLoad.rounded(toPlaces: 2) * 100)) %"

2
Modules/Memory/popup.swift
View File

@@ -101,7 +101,7 @@ internal class Popup: NSView {
public func loadCallback(_ value: RAM_Usage) {
DispatchQueue.main.async(execute: {
if self.window!.isVisible || !self.initialized {
if (self.window?.isVisible ?? false) || !self.initialized {
self.activeField?.stringValue = Units(bytes: Int64(value.active!)).getReadableMemory()
self.inactiveField?.stringValue = Units(bytes: Int64(value.inactive!)).getReadableMemory()
self.wiredField?.stringValue = Units(bytes: Int64(value.wired!)).getReadableMemory()

4
Modules/Net/popup.swift
View File

@@ -147,7 +147,7 @@ internal class Popup: NSView {
public func usageCallback(_ value: Network_Usage) {
DispatchQueue.main.async(execute: {
if !self.window!.isVisible && self.initialized && value.active {
if !(self.window?.isVisible ?? false) && self.initialized && value.active {
return
}
@@ -179,7 +179,7 @@ internal class Popup: NSView {
if value.connectionType != nil {
var networkType = ""
if value.connectionType == .wifi {
networkType = "\(value.networkName!) (WiFi)"
networkType = "\(value.networkName ?? "unknown") (WiFi)"
} else if value.connectionType == .ethernet {
networkType = "Ethernet"
}

8
Modules/Net/readers.swift
View File

@@ -179,12 +179,12 @@ internal class UsageReader: Reader<Network_Usage> {
let matchingDict = matchingDictUM! as NSMutableDictionary
matchingDict["IOPropertyMatch"] = [ "IOPrimaryInterface" : true]
var matchingServices : io_iterator_t = 0
if IOServiceGetMatchingServices(kIOMasterPortDefault, matchingDict, &matchingServices) != KERN_SUCCESS {
return nil
}
return matchingServices
}
@@ -203,11 +203,11 @@ internal class UsageReader: Reader<Network_Usage> {
}
IOObjectRelease(controllerService)
}
IOObjectRelease(intfService)
intfService = IOIteratorNext(intfIterator)
}
return macAddress
}
}

4
Stats.xcodeproj/project.pbxproj
View File

@@ -1680,7 +1680,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MARKETING_VERSION = 2.1.1;
MARKETING_VERSION = 2.1.2;
PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1712,7 +1712,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MARKETING_VERSION = 2.1.1;
MARKETING_VERSION = 2.1.2;
PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";