Skip to content

Commit f3da477

Browse files
committed
improve startup automations experience
1 parent 6658f1b commit f3da477

4 files changed

Lines changed: 8 additions & 4 deletions

File tree

app/src/main/kotlin/com/spoiligaming/explorer/WindowsProcessPriority.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package com.spoiligaming.explorer
2020

21+
import com.spoiligaming.explorer.settings.util.AppStoragePaths
2122
import com.spoiligaming.explorer.util.OSUtils
2223
import com.sun.jna.platform.win32.Kernel32
2324
import com.sun.jna.platform.win32.WinDef.DWORD
@@ -27,7 +28,7 @@ internal object WindowsProcessPriority {
2728
private const val WINDOWS_IDLE_PRIORITY_CLASS = 0x00000040
2829

2930
fun applyAutoStartupPriority() {
30-
if (!OSUtils.isWindows || OSUtils.isRunningOnBareJvm) {
31+
if (!OSUtils.isWindows || OSUtils.isRunningOnBareJvm || AppStoragePaths.isPortableInstall) {
3132
return
3233
}
3334

ui/src/main/kotlin/com/spoiligaming/explorer/ui/screens/settings/sections/StartupSettingsSection.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import androidx.compose.runtime.Composable
2323
import androidx.compose.runtime.rememberCoroutineScope
2424
import com.spoiligaming.explorer.settings.manager.startupSettingsManager
2525
import com.spoiligaming.explorer.settings.model.ComputerStartupBehavior
26+
import com.spoiligaming.explorer.settings.util.AppStoragePaths
2627
import com.spoiligaming.explorer.ui.com.spoiligaming.explorer.ui.LocalStartupSettings
2728
import com.spoiligaming.explorer.ui.screens.settings.components.SettingsSection
2829
import com.spoiligaming.explorer.ui.snackbar.SnackbarController
@@ -59,7 +60,7 @@ internal fun StartupSettingsSection() {
5960
header = t(Res.string.settings_section_startup),
6061
settings =
6162
buildList {
62-
if ((OSUtils.isWindows || OSUtils.isDebian) && !OSUtils.isRunningOnBareJvm) {
63+
if ((OSUtils.isWindows || OSUtils.isDebian) && !OSUtils.isRunningOnBareJvm && !AppStoragePaths.isPortableInstall) {
6364
add {
6465
ComputerStartupBehaviorDropdown(
6566
currentMode = startupSettings.computerStartupBehavior,

ui/src/main/kotlin/com/spoiligaming/explorer/ui/screens/setup/SetupScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ import com.spoiligaming.explorer.settings.manager.singleplayerSettingsManager
6363
import com.spoiligaming.explorer.settings.manager.startupSettingsManager
6464
import com.spoiligaming.explorer.settings.model.ComputerStartupBehavior
6565
import com.spoiligaming.explorer.settings.model.StartupSettings
66+
import com.spoiligaming.explorer.settings.util.AppStoragePaths
6667
import com.spoiligaming.explorer.ui.com.spoiligaming.explorer.ui.LocalPrefs
6768
import com.spoiligaming.explorer.ui.com.spoiligaming.explorer.ui.LocalSingleplayerSettings
6869
import com.spoiligaming.explorer.ui.com.spoiligaming.explorer.ui.LocalStartupSettings
@@ -170,7 +171,7 @@ internal fun SetupWizard(
170171
val scope = rememberCoroutineScope()
171172
val activeServerListFilePath by ServerListFileBookmarksManager.activePath.collectAsState()
172173
val setupWizardFinishFailedMessage = t(Res.string.setup_wizard_finish_failed)
173-
val supportsStartupRegistration = (OSUtils.isWindows || OSUtils.isDebian) && !OSUtils.isRunningOnBareJvm
174+
val supportsStartupRegistration = (OSUtils.isWindows || OSUtils.isDebian) && !OSUtils.isRunningOnBareJvm && !AppStoragePaths.isPortableInstall
174175

175176
LaunchedEffect(Unit) {
176177
ServerListFileBookmarksManager.load()

ui/src/main/kotlin/com/spoiligaming/explorer/ui/screens/setup/steps/StartupStep.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import androidx.compose.ui.input.pointer.PointerIcon
4343
import androidx.compose.ui.input.pointer.pointerHoverIcon
4444
import androidx.compose.ui.unit.dp
4545
import com.spoiligaming.explorer.settings.model.ComputerStartupBehavior
46+
import com.spoiligaming.explorer.settings.util.AppStoragePaths
4647
import com.spoiligaming.explorer.ui.screens.setup.SetupStepContainer
4748
import com.spoiligaming.explorer.ui.screens.setup.SetupUiState
4849
import com.spoiligaming.explorer.ui.screens.setup.widgets.OnboardingItemSwitch
@@ -227,7 +228,7 @@ private fun LowMemoryNoticeCard(modifier: Modifier = Modifier) =
227228
}
228229
}
229230

230-
val supportsStartupRegistration = (OSUtils.isWindows || OSUtils.isDebian) && !OSUtils.isRunningOnBareJvm
231+
val supportsStartupRegistration = (OSUtils.isWindows || OSUtils.isDebian) && !OSUtils.isRunningOnBareJvm && !AppStoragePaths.isPortableInstall
231232
private val isLowMemoryDevice by lazy {
232233
OSUtils.totalPhysicalMemoryBytes in 1..<LOW_MEMORY_THRESHOLD_BYTES
233234
}

0 commit comments

Comments
 (0)