Skip to content

fix portable settings.path not respected for prefs and language #1439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
avinxshKD wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −2
Open

fix portable settings.path not respected for prefs and language #1439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/processing/app/Preferences.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ fun PreferencesProvider(content: @Composable () -> Unit) {
val preferencesFileOverride: File? = System.getProperty("processing.app.preferences.file")?.let { File(it) }
val preferencesDebounceOverride: Long? = System.getProperty("processing.app.preferences.debounce")?.toLongOrNull()

val settingsFolder = Settings.getFolder()
val settingsFolder = Base.getSettingsOverride() ?: Settings.getFolder()
val preferencesFile = preferencesFileOverride ?: settingsFolder.resolve(PREFERENCES_FILE_NAME)

if (!preferencesFile.exists()) {
Expand Down
3 changes: 2 additions & 1 deletion app/src/processing/app/ui/theme/Locale.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package processing.app.ui.theme
import androidx.compose.runtime.*
import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.unit.LayoutDirection
import processing.app.Base
import processing.app.Messages
import processing.app.watchFile
import processing.utils.Settings
Expand Down Expand Up @@ -90,7 +91,7 @@ var LastLocaleUpdate by mutableStateOf(0L)
*/
@Composable
fun LocaleProvider(content: @Composable () -> Unit) {
val settingsFolder = Settings.getFolder()
val settingsFolder = Base.getSettingsOverride() ?: Settings.getFolder()
val languageFile = File(settingsFolder, "language.txt")
watchFile(languageFile)

Expand Down