birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating latest from github/staging

Browse Source 
Integrating up through commit 5e1bdae
This commit is contained in:
alexpete
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/GraphicsSettingsDialog.cpp
+8 -4
View File
@@ -28,6 +28,8 @@
#include <QFontMetrics>
#include <QSettings>
#include <AzCore/Utils/Utils.h>
// AzFramework
#include <AzFramework/IO/LocalFileIO.h>
#include <AzQtComponents/Components/Widgets/PushButton.h>
@@ -975,8 +977,9 @@ void GraphicsSettingsDialog::accept()
void GraphicsSettingsDialog::OpenCustomSpecDialog()
{
QString projectName = GetIEditor()->GetProjectName();
QString settingsPath = projectName + "/" + SETTINGS_FILE_PATH;
AZ::IO::FixedMaxPath projectPath = AZ::Utils::GetProjectPath();
projectPath /= SETTINGS_FILE_PATH.toUtf8().constData();
QString settingsPath = QString::fromUtf8(projectPath.c_str(), aznumeric_cast<int>(projectPath.Native().size()));
CAutoDirectoryRestoreFileDialog importCustomSpecDialog(QFileDialog::AcceptOpen, QFileDialog::ExistingFile, ".cfg", settingsPath, CFG_FILEFILTER, {}, {}, this);
@@ -1189,8 +1192,9 @@ void GraphicsSettingsDialog::SaveSystemSettings()
// Adding the project name to the path so that the file is created there if it doesn't already exist
// as we don't want to modify the version in Engine/config.
QString projectName = GetIEditor()->GetProjectName();
QString settingsPath = projectName + "/" + SETTINGS_FILE_PATH;
AZ::IO::FixedMaxPath projectPath = AZ::Utils::GetProjectPath();
projectPath /= SETTINGS_FILE_PATH.toUtf8().constData();
QString settingsPath = QString::fromUtf8(projectPath.c_str(), aznumeric_cast<int>(projectPath.Native().size()));
QString settingsFile = settingsPath + m_cfgFiles[m_currentPlatform][cfgFileIndex].c_str();