Merge branch '33-unable-to-access-c-users-username-documents-gridtracker-folder-permission-violation-gt-can-t' into 'master'

Resolve "Unable to access C:\Users\username\Documents\GridTracker folder, Permission violation, GT can't continue"

Closes #33

See merge request gridtracker.org/gridtracker!45
merge-requests/46/merge
Matthew Chambers 2021-01-03 20:37:16 +00:00
commit d83bac7980
1 zmienionych plików z 20 dodań i 9 usunięć

Wyświetl plik

@ -15380,18 +15380,29 @@ function mediaCheck()
{
var homeDir = (g_platform == "windows") ? process.env.USERPROFILE : process.env.HOME;
g_appData = path.join(homeDir, "Dokumente");
g_appData = path.join(homeDir, "OneDrive\\Dokumente");
if (!is_dir(g_appData))
{
g_appData = path.join(homeDir, "Documents");
g_appData = path.join(homeDir, "OneDrive\\Documents");
if (!is_dir(g_appData))
{
if (g_appSettings.savedAppData != null)
g_appData = path.join(homeDir, "Dokumente")
if (!is_dir(g_appData))
{
g_appData = g_appSettings.savedAppData;
if (!is_dir(g_appData)) return false;
g_appData = path.join(homeDir, "Documents")
if (!is_dir(g_appData))
{
if (g_appSettings.savedAppData != null)
{
g_appData = g_appSettings.savedAppData;
if (!is_dir(g_appData)) return false;
}
else
{
return false;
}
}
}
else return false;
}
}
@ -15405,6 +15416,7 @@ function mediaCheck()
try
{
var tryDirectory = "";
var userdirs = [
g_appData,
g_NWappData,
@ -15416,6 +15428,7 @@ function mediaCheck()
{
if (!fs.existsSync(dir))
{
tryDirectory = dir;
fs.mkdirSync(dir);
}
}
@ -15423,9 +15436,7 @@ function mediaCheck()
catch (e)
{
alert(
"Unable to create or access " +
g_appData +
" folder.\r\nPermission violation, GT cannot continue"
"Unable to create or access " + tryDirectory + " folder.\r\nPermission violation, GT cannot continue"
);
nw.App.quit();
}