mirror of https://github.com/OpenRCT2/OpenRCT2.git
more bash escapes on zenity commands for file dialog
This commit is contained in:
parent
fb0661b55e
commit
b552231c1d
|
@ -376,7 +376,7 @@ bool platform_open_common_file_dialog(utf8 *outFilename, file_dialog_desc *desc,
|
|||
}
|
||||
}
|
||||
|
||||
snprintf(cmd, MAX_PATH, "%s --title \"%s\" %s '%s/' ~ \"%s\"", executable, desc->title, action, desc->initial_directory, filter);
|
||||
snprintf(cmd, MAX_PATH, "%s --title '%s' %s '%s/' ~ '%s'", executable, desc->title, action, desc->initial_directory, filter);
|
||||
break;
|
||||
case DT_ZENITY:
|
||||
action = "--file-selection";
|
||||
|
@ -412,15 +412,15 @@ bool platform_open_common_file_dialog(utf8 *outFilename, file_dialog_desc *desc,
|
|||
filterPatternRegex[regexIterator+1] = 0;
|
||||
|
||||
char filterTemp[100] = { 0 };
|
||||
snprintf(filterTemp, countof(filterTemp), " --file-filter=\"%s | %s\"", desc->filters[j].name, filterPatternRegex);
|
||||
snprintf(filterTemp, countof(filterTemp), " --file-filter='%s | %s'", desc->filters[j].name, filterPatternRegex);
|
||||
safe_strcat(filter, filterTemp, countof(filter));
|
||||
}
|
||||
}
|
||||
char filterTemp[100] = { 0 };
|
||||
snprintf(filterTemp, countof(filterTemp), " --file-filter=\"%s | *\"", (char *)language_get_string(STR_ALL_FILES));
|
||||
snprintf(filterTemp, countof(filterTemp), " --file-filter='%s | *'", (char *)language_get_string(STR_ALL_FILES));
|
||||
safe_strcat(filter, filterTemp, countof(filter));
|
||||
|
||||
snprintf(cmd, MAX_PATH, "%s %s --filename='%s/' %s --title=\"%s\" / %s", executable, action, desc->initial_directory, flags, desc->title, filter);
|
||||
snprintf(cmd, MAX_PATH, "%s %s --filename='%s/' %s --title='%s' / %s", executable, action, desc->initial_directory, flags, desc->title, filter);
|
||||
break;
|
||||
default: return 0;
|
||||
}
|
||||
|
@ -473,10 +473,10 @@ utf8 *platform_open_directory_browser(utf8 *title) {
|
|||
|
||||
switch (dtype) {
|
||||
case DT_KDIALOG:
|
||||
snprintf(cmd, MAX_PATH, "%s --title \"%s\" --getexistingdirectory /", executable, title);
|
||||
snprintf(cmd, MAX_PATH, "%s --title '%s' --getexistingdirectory /", executable, title);
|
||||
break;
|
||||
case DT_ZENITY:
|
||||
snprintf(cmd, MAX_PATH, "%s --title=\"%s\" --file-selection --directory /", executable, title);
|
||||
snprintf(cmd, MAX_PATH, "%s --title='%s' --file-selection --directory /", executable, title);
|
||||
break;
|
||||
default: return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue