neon443/ShhShell
1
0
Fork 0
mirror of https://github.com/neon443/ShhShell.git synced 2026-03-11 13:26:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix crash when disconnecting, fix close terminal on exit

Browse Source
This commit is contained in:
neon443
2025-06-26 12:49:27 +01:00
parent 319373682c
commit 51459f1839
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ShhShell/SSH/SSHHandler.swift
View File

@@ -17,7 +17,7 @@ class SSHHandler: @unchecked Sendable, ObservableObject {
@Published var title: String = "" @Published var title: String = ""
@Published var state: SSHState = .idle @Published var state: SSHState = .idle
var connected: Bool { var connected: Bool {
return checkConnected(state) return ssh_channel_is_open(channel) == 1 && checkConnected(state)
} }
@Published var testSuceeded: Bool? = nil @Published var testSuceeded: Bool? = nil
@@ -46,7 +46,6 @@ class SSHHandler: @unchecked Sendable, ObservableObject {
func go() { func go() {
guard !connected else { guard !connected else {
withAnimation { state = .idle }
disconnect() disconnect()
return return
} }

13
ShhShell/Views/Terminal/SSHTerminalView.swift
View File

@@ -28,19 +28,16 @@ final class SSHTerminalView: TerminalView, Sendable, @preconcurrency TerminalVie
sshQueue.async { sshQueue.async {
Task { Task {
guard let handler = await self.handler else { return } guard let handler = await self.handler else { return }
while handler.connected { while handler.connected {
if let read = handler.readFromChannel() { if let read = handler.readFromChannel() {
// Task { [weak self] in Task { @MainActor in
// guard let self else { return } self.feed(text: read)
Task { @MainActor in }
self.feed(text: read)
}
// }
} else { } else {
try? await Task.sleep(nanoseconds: 10_000_000) //10ms Task {try? await Task.sleep(nanoseconds: 10_000_000) } //10ms
} }
} }
handler.disconnect()
} }
} }
} }