mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 04:23:20 +01:00
Code Issues Releases Wiki Activity

Fix fault in #6401: append extensions only when saving

Browse Source
This commit is contained in:
Daniel Trujillo Viedma
2017-10-11 09:43:49 +02:00
committed by Michael Steenbeek
parent 17557569d0
commit 39ecd37d27
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/openrct2-ui/UiContext.Linux.cpp
View File

@@ -160,20 +160,27 @@ namespace OpenRCT2 { namespace Ui
std::string output;
if (Execute(cmd, &output) == 0)
{
// The default file extension is taken from the **first** available filter, since
// we cannot obtain it from zenity's output. This means that the FileDialogDesc::Filters
// array must be carefully populated, at least the first element.
std::string pattern = desc.Filters[0].Pattern;
std::string defaultExtension = pattern.substr(pattern.find_last_of('.'));
int dotPosition = output.size() - defaultExtension.size();
// Add the default extension if no extension is specified
if (output.substr(dotPosition, defaultExtension.size()).compare(defaultExtension) == 0)
if (desc.Type == FILE_DIALOG_TYPE::SAVE)
{
result = output;
// The default file extension is taken from the **first** available filter, since
// we cannot obtain it from zenity's output. This means that the FileDialogDesc::Filters
// array must be carefully populated, at least the first element.
std::string pattern = desc.Filters[0].Pattern;
std::string defaultExtension = pattern.substr(pattern.find_last_of('.'));
int dotPosition = output.size() - defaultExtension.size();
// Add the default extension if no extension is specified
if (output.substr(dotPosition, defaultExtension.size()).compare(defaultExtension) == 0)
{
result = output;
}
else
{
result = output.append(defaultExtension);
}
}
else
{
result = output.append(defaultExtension);
result = output;
}
}
break;