Skip to content

Commit a242630

Browse files
committed
fix regression affecting MSI and EXE installers since 2.2.0-alpha.01
1 parent 1ace371 commit a242630

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ internal object StartupAppDataMigration {
7878
targetDir = AppStoragePaths.platformConfigRootDir,
7979
),
8080
MigrationSpec(
81-
name = "LegacyNamedPlatformLogsRootToPreferredLogsRoot",
81+
name = "LegacyNamedPlatformLogsToPreferredLogsInAppData",
8282
sourceDir = AppStoragePaths.legacyNamedPlatformLogsRootDir,
83-
targetDir = AppStoragePaths.platformLogsRootDir,
83+
targetDir = AppStoragePaths.platformLogsDir,
8484
),
8585
)
8686

settings/src/main/kotlin/com/spoiligaming/explorer/settings/util/AppStoragePaths.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ object AppStoragePaths {
8686

8787
val logsParentDir =
8888
when {
89-
isWindows -> windowsLocalDir
89+
isWindows -> windowsRoamingDir
9090
isMac -> homeDir.resolve("Library/Logs")
9191
else -> xdgStateDir
9292
}
@@ -101,7 +101,12 @@ object AppStoragePaths {
101101

102102
val legacyNamedPlatformConfigRootDir = configParentDir.resolve(LEGACY_APP_DIR_NAME)
103103

104-
val legacyNamedPlatformLogsRootDir = logsParentDir.resolve(LEGACY_APP_DIR_NAME)
104+
val legacyNamedPlatformLogsRootDir =
105+
if (isWindows) {
106+
windowsLocalDir.resolve(LEGACY_APP_DIR_NAME).resolve(LOGS_DIR_NAME)
107+
} else {
108+
logsParentDir.resolve(LEGACY_APP_DIR_NAME).resolve(LOGS_DIR_NAME)
109+
}
105110

106111
val platformSettingsDir = platformConfigRootDir.resolve(SETTINGS_DIR_NAME)
107112

0 commit comments

Comments
 (0)