mirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-04-23 08:00:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes [stage]

Browse Source
This commit is contained in:
crschnick
2024-12-29 21:27:54 +00:00
parent 1af4031169
commit ed6f24a2bf
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java
View File

@@ -93,7 +93,7 @@ public class StoreEntryWrapper {
}
public boolean isInStorage() {
return DataStorage.get().getStoreEntries().contains(entry);
return DataStorage.get() != null && DataStorage.get().getStoreEntries().contains(entry);
}
public void editDialog() {

6
app/src/main/java/io/xpipe/app/core/mode/OperationMode.java
View File

@@ -36,8 +36,6 @@ public abstract class OperationMode {
@Getter
private static boolean inShutdownHook;
private static boolean windowRequested;
private static OperationMode CURRENT = null;
public static OperationMode map(XPipeDaemonMode mode) {
@@ -122,10 +120,6 @@ public abstract class OperationMode {
}
public static XPipeDaemonMode getStartupMode() {
if (windowRequested) {
return XPipeDaemonMode.GUI;
}
var arg = AppProperties.get().getArguments().getModeArg();
if (arg != null) {
return arg;

5
app/src/main/java/io/xpipe/app/issue/TerminalErrorHandler.java
View File

@@ -8,6 +8,7 @@ import io.xpipe.app.core.window.AppDialog;
import io.xpipe.app.update.XPipeDistributionType;
import io.xpipe.app.util.Hyperlinks;
import io.xpipe.app.util.PlatformInit;
import io.xpipe.app.util.ThreadHelper;
public class TerminalErrorHandler extends GuiErrorHandlerBase implements ErrorHandler {
@@ -28,6 +29,7 @@ public class TerminalErrorHandler extends GuiErrorHandlerBase implements ErrorHa
ErrorAction.ignore().handle(event);
})) {
// Exit if we couldn't initialize the GUI
ThreadHelper.sleep(1000);
OperationMode.halt(1);
return;
}
@@ -51,6 +53,7 @@ public class TerminalErrorHandler extends GuiErrorHandlerBase implements ErrorHa
handleProbableUpdate();
}
ThreadHelper.sleep(1000);
OperationMode.halt(1);
}
@@ -60,6 +63,7 @@ public class TerminalErrorHandler extends GuiErrorHandlerBase implements ErrorHa
var second = ErrorEvent.fromThrowable(t).build();
log.handle(second);
ErrorAction.ignore().handle(second);
ThreadHelper.sleep(1000);
OperationMode.halt(1);
}
@@ -82,6 +86,7 @@ public class TerminalErrorHandler extends GuiErrorHandlerBase implements ErrorHa
var event = ErrorEvent.fromThrowable(t).build();
log.handle(event);
ErrorAction.ignore().handle(event);
ThreadHelper.sleep(1000);
OperationMode.halt(1);
}
}

6
app/src/main/java/io/xpipe/app/terminal/TerminalLauncher.java
View File

@@ -29,7 +29,8 @@ public class TerminalLauncher {
new TerminalInitScriptConfig(
title,
type.shouldClear()
&& AppPrefs.get().clearTerminalOnInit().get(),
&& AppPrefs.get().clearTerminalOnInit().get()
&& !AppPrefs.get().developerPrintInitFiles().get(),
TerminalInitFunction.none()),
true);
var config = new TerminalLaunchConfiguration(null, title, title, true, script, sc.getShellDialect());
@@ -66,7 +67,8 @@ public class TerminalLauncher {
adjustedTitle,
!log
&& type.shouldClear()
&& AppPrefs.get().clearTerminalOnInit().get(),
&& AppPrefs.get().clearTerminalOnInit().get()
&& !AppPrefs.get().developerPrintInitFiles().get(),
cc instanceof ShellControl ? type.additionalInitCommands() : TerminalInitFunction.none());
var config = TerminalLaunchConfiguration.create(request, entry, cleanTitle, adjustedTitle, preferTabs);
var latch = TerminalLauncherManager.submitAsync(request, cc, terminalConfig, directory);

2
version
View File

@@ -1 +1 @@
14.0-30
14.0-31