lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-07-08 11:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
crschnick
2026-06-20 01:47:58 +00:00
parent a2392ed1df
commit 3763f18fe6
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/xpipe/app/process/ShellControl.java
+9 -6
View File
@@ -106,14 +106,17 @@ public interface ShellControl extends ProcessControl {
return onInit(shellControl -> {
var or = shellControl.getOriginalShellDialect();
var oldState = store.getState();
var s = oldState.toBuilder()
.osType(shellControl.getOsType())
var newState = oldState.toBuilder()
.shellDialect(or.isMarkerDialect() ? oldState.getShellDialect() : or)
.ttyState(shellControl.getTtyState())
.running(true)
.osName(shellControl.getOsName())
.build();
store.setState(s.asNeeded());
.running(true);
if (shellControl.getOsType() != null) {
newState.osType(shellControl.getOsType());
}
if (shellControl.getOsName() != null) {
newState.osName(shellControl.getOsName());
}
store.setState(newState.build().asNeeded());
});
}
app/src/main/java/io/xpipe/app/terminal/TerminalDockHubManager.java
+3 -2
View File
@@ -228,11 +228,12 @@ public class TerminalDockHubManager {
var listener = new TerminalView.Listener() {
@Override
public void onSessionOpened(TerminalView.ShellSession session) {
if (!hubRequests.contains(session.getRequest())) {
if (!(session.getTerminal() instanceof TerminalView.ControllableTerminalSession t)) {
return;
}
if (!(session.getTerminal() instanceof TerminalView.ControllableTerminalSession t)) {
if (!hubRequests.contains(session.getRequest())) {
t.getControllable().own(NativeWinWindowControl.MAIN_WINDOW);
return;
}