You've already forked AstralRinth
forked from didirus/AstralRinth
Force portable config if portable.txt is present
This commit is contained in:
@@ -188,7 +188,20 @@ fn main() {
|
|||||||
.plugin(tauri_plugin_shell::init())
|
.plugin(tauri_plugin_shell::init())
|
||||||
.plugin(
|
.plugin(
|
||||||
tauri_plugin_window_state::Builder::default()
|
tauri_plugin_window_state::Builder::default()
|
||||||
.with_filename("app-window-state.json")
|
.with_filename(
|
||||||
|
if std::env::current_dir()
|
||||||
|
.ok()
|
||||||
|
.map(|dir| dir.join("portable.txt").exists())
|
||||||
|
.unwrap_or(false)
|
||||||
|
{
|
||||||
|
std::env::current_dir()
|
||||||
|
.ok()
|
||||||
|
.map(|dir| dir.join("UserData/app-window-state.json").to_string_lossy().into_owned())
|
||||||
|
.unwrap()
|
||||||
|
} else {
|
||||||
|
"app-window-state.json".to_string()
|
||||||
|
},
|
||||||
|
)
|
||||||
.build(),
|
.build(),
|
||||||
)
|
)
|
||||||
.setup(|app| {
|
.setup(|app| {
|
||||||
|
|||||||
@@ -23,8 +23,13 @@ impl DirectoryInfo {
|
|||||||
// Get the settings directory
|
// Get the settings directory
|
||||||
// init() is not needed for this function
|
// init() is not needed for this function
|
||||||
pub fn get_initial_settings_dir() -> Option<PathBuf> {
|
pub fn get_initial_settings_dir() -> Option<PathBuf> {
|
||||||
Self::env_path("THESEUS_CONFIG_DIR")
|
Self::env_path("THESEUS_CONFIG_DIR").or_else(|| {
|
||||||
.or_else(|| Some(dirs::data_dir()?.join("AstralRinthApp")))
|
if std::env::current_dir().ok()?.join("portable.txt").exists() {
|
||||||
|
Some(std::path::Path::new("UserData").to_path_buf())
|
||||||
|
} else {
|
||||||
|
Some(dirs::data_dir()?.join("AstralRinthApp"))
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Get all paths needed for Theseus to operate properly
|
/// Get all paths needed for Theseus to operate properly
|
||||||
|
|||||||
Reference in New Issue
Block a user