Compare commits

..

No commits in common. "4c172e9c8ae1f1006d7faa59ec9ef2df51f1be42" and "37613a6ca5ae799340226f2e393b2415bdfaae16" have entirely different histories.

View file

@ -12,7 +12,6 @@ PluginComponent {
property bool isConnected: false property bool isConnected: false
property string tailscaleIP: "" property string tailscaleIP: ""
property string _pendingToggleAction: ""
property string currentExitNode: "" property string currentExitNode: ""
property var peers: [] property var peers: []
property string cachedClipboardTool: "" property string cachedClipboardTool: ""
@ -42,11 +41,10 @@ PluginComponent {
onExited: (code, status) => { onExited: (code, status) => {
if (code !== 0) { if (code !== 0) {
var action = root._pendingToggleAction || (root.isConnected ? "disconnect" : "connect") var action = root.isConnected ? "disconnect" : "connect"
var detail = toggleProcess.stderr.text.trim().slice(0, 120) var detail = toggleProcess.stderr.text.trim().slice(0, 120)
ToastService.showError("tailscalectl", TailscaleLib.errorMessage(action) + (detail ? " — " + detail : "")) ToastService.showError("tailscalectl", TailscaleLib.errorMessage(action) + (detail ? " — " + detail : ""))
} }
root._pendingToggleAction = ""
statusCheck.running = true statusCheck.running = true
} }
} }
@ -114,7 +112,6 @@ PluginComponent {
} }
function toggleTailscale() { function toggleTailscale() {
root._pendingToggleAction = root.isConnected ? "disconnect" : "connect"
toggleProcess.command = TailscaleLib.buildToggleCommand(root.isConnected) toggleProcess.command = TailscaleLib.buildToggleCommand(root.isConnected)
toggleProcess.running = true toggleProcess.running = true
} }