From 787388a3ddcfcbcdf80a14b722ad40d355e5a481 Mon Sep 17 00:00:00 2001 From: mfeemster Date: Tue, 8 Mar 2016 20:37:19 -0800 Subject: [PATCH] --Bug fixes -Try yet again to place last.flame in ~/.config/Fractorium on Linux. -Remove ~/.Fractorium as a search path on Linux, it's non-standard. --- Source/EmberCommon/EmberCommon.h | 1 - Source/Fractorium/FractoriumEmberController.cpp | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Source/EmberCommon/EmberCommon.h b/Source/EmberCommon/EmberCommon.h index 687459d..42ce4e3 100644 --- a/Source/EmberCommon/EmberCommon.h +++ b/Source/EmberCommon/EmberCommon.h @@ -117,7 +117,6 @@ static bool InitPaletteList(const string& filename) "./", #ifndef _WIN32 "~" - "~/.Fractorium", "~/.config/Fractorium", "/usr/share/fractorium", "/usr/local/share/fractorium" diff --git a/Source/Fractorium/FractoriumEmberController.cpp b/Source/Fractorium/FractoriumEmberController.cpp index 10a45bb..734cfe6 100644 --- a/Source/Fractorium/FractoriumEmberController.cpp +++ b/Source/Fractorium/FractoriumEmberController.cpp @@ -63,7 +63,6 @@ FractoriumEmberController::FractoriumEmberController(Fractorium* fractorium) QDir::currentPath().toLocal8Bit().data(), QDir::homePath().toLocal8Bit().data(), QCoreApplication::applicationDirPath().toLocal8Bit().data(), - QString("~/.Fractorium").toLocal8Bit().data(), QString("~/.config/Fractorium").toLocal8Bit().data(), QString("/usr/share/fractorium").toLocal8Bit().data(), QString("/usr/local/share/fractorium").toLocal8Bit().data() @@ -354,12 +353,12 @@ void FractoriumEmberController::SetEmberPrivate(const Ember& ember, bool v #ifdef _WIN32 string filename = "last.flame"; #else - QDir dir("~/.config/Fractorium"); + QDir dir(QDir::homePath() + "/.config/Fractorium"); if (!dir.exists()) dir.mkpath("."); - string filename = "~/.config/Fractorium/last.flame"; + string filename = QDir::homePath().toStdString() + "/.config/Fractorium/last.flame"; #endif writer.Save(filename.c_str(), m_Ember, 0, true, false, true); m_GLController->ResetMouseState();