Skip to content

Commit 173f646

Browse files
authored
fix portable settings.path not respected for prefs and language (#1439)
1 parent 9c3d45d commit 173f646

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

app/src/processing/app/Preferences.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ fun PreferencesProvider(content: @Composable () -> Unit) {
8080
val preferencesFileOverride: File? = System.getProperty("processing.app.preferences.file")?.let { File(it) }
8181
val preferencesDebounceOverride: Long? = System.getProperty("processing.app.preferences.debounce")?.toLongOrNull()
8282

83-
val settingsFolder = Settings.getFolder()
83+
val settingsFolder = Base.getSettingsOverride() ?: Settings.getFolder()
8484
val preferencesFile = preferencesFileOverride ?: settingsFolder.resolve(PREFERENCES_FILE_NAME)
8585

8686
if (!preferencesFile.exists()) {

app/src/processing/app/ui/theme/Locale.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package processing.app.ui.theme
33
import androidx.compose.runtime.*
44
import androidx.compose.ui.platform.LocalLayoutDirection
55
import androidx.compose.ui.unit.LayoutDirection
6+
import processing.app.Base
67
import processing.app.Messages
78
import processing.app.watchFile
89
import processing.utils.Settings
@@ -90,7 +91,7 @@ var LastLocaleUpdate by mutableStateOf(0L)
9091
*/
9192
@Composable
9293
fun LocaleProvider(content: @Composable () -> Unit) {
93-
val settingsFolder = Settings.getFolder()
94+
val settingsFolder = Base.getSettingsOverride() ?: Settings.getFolder()
9495
val languageFile = File(settingsFolder, "language.txt")
9596
watchFile(languageFile)
9697

0 commit comments

Comments
 (0)