0ct0pu5/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2025-04-19 02:33:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Context shutdown fixes

Browse source
This commit is contained in:
crschnick 2024-09-23 13:57:41 +00:00
parent eec1b807b2
commit 3fe38a4261
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/io/xpipe/app/comp/store/StoreCreationComp.java
View file

@ -167,6 +167,9 @@ public class StoreCreationComp extends DialogComp {
v -> true,
(newE, context, validated) -> {
ThreadHelper.runAsync(() -> {
if (context != null) {
context.close();
}
if (!DataStorage.get().getStoreEntries().contains(e)) {
DataStorage.get().addStoreEntryIfNotPresent(newE);
} else {
@ -196,7 +199,7 @@ public class StoreCreationComp extends DialogComp {
(e, context, validated) -> {
try {
DataStorage.get().addStoreEntryIfNotPresent(e);
if (validated
if (context != null && validated
&& e.getProvider().shouldShowScan()
&& AppPrefs.get()
.openConnectionSearchWindowOnConnectionCreation()

2
core/src/main/java/io/xpipe/core/process/ProcessControl.java
View file

@ -34,6 +34,8 @@ public interface ProcessControl extends AutoCloseable {
@Override
void close() throws Exception;
void shutdown() throws Exception;
void kill();
ProcessControl start() throws Exception;

2
core/src/main/java/io/xpipe/core/store/ShellValidationContext.java
View file

@ -17,7 +17,7 @@ public class ShellValidationContext implements ValidationContext<ShellControl> {
@Override
public void close() {
try {
shellControl.close();
shellControl.shutdown();
} catch (Exception ignored) {
}
}

1
lang/base/strings/translations_en.properties
View file

@ -167,7 +167,6 @@ init=Init
shell=Shell
hub=Hub
#context: Computer script
#force
script=script