MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-06-25 22:09:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix txPath save/load.

Browse Source 
Fixed Texture pack path not saved correctly #456
This commit is contained in:
Sergey Lipskiy 2015-05-05 16:44:37 +06:00
parent a1fdd33389
commit 5329a2a01b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/GLideNUI/ConfigDialog.cpp
View File

@ -327,7 +327,7 @@ void ConfigDialog::accept()
QString txPath = ui->txPathLabel->text();
if (!txPath.isEmpty())
config.textureFilter.txPath[txPath.toWCharArray(config.textureFilter.txPath)] = '\0';
config.textureFilter.txPath[txPath.toWCharArray(config.textureFilter.txPath)] = L'\0';
config.font.size = m_font.pointSize();
QString fontName = m_font.family() + ".ttf";
@ -422,7 +422,7 @@ void ConfigDialog::on_texPackPathButton_clicked()
QFileDialog::Options options = QFileDialog::DontResolveSymlinks | QFileDialog::ShowDirsOnly | QFileDialog::ReadOnly | QFileDialog::DontUseSheet | QFileDialog::ReadOnly | QFileDialog::HideNameFilterDetails;
QString directory = QFileDialog::getExistingDirectory(this,
"",
QString::fromWCharArray(config.textureFilter.txPath),
ui->txPathLabel->text(),
options);
if (!directory.isEmpty())
ui->txPathLabel->setText(directory);

4
src/GLideNUI/Settings.cpp
View File

@ -66,7 +66,9 @@ void _loadSettings(QSettings & settings)
config.textureFilter.txForce16bpp = settings.value("txForce16bpp", config.textureFilter.txForce16bpp).toInt();
config.textureFilter.txCacheCompression = settings.value("txCacheCompression", config.textureFilter.txCacheCompression).toInt();
config.textureFilter.txSaveCache = settings.value("txSaveCache", config.textureFilter.txSaveCache).toInt();
settings.value("txPath", "").toString().toWCharArray(config.textureFilter.txPath);
QString txPath = QString::fromWCharArray(config.textureFilter.txPath);
config.textureFilter.txPath[settings.value("txPath", txPath).toString().toWCharArray(config.textureFilter.txPath)] = L'\0';
settings.endGroup();
settings.beginGroup("font");