diff --git a/Source/EmberCommon/EmberCommon.h b/Source/EmberCommon/EmberCommon.h index 461048c..905d49d 100644 --- a/Source/EmberCommon/EmberCommon.h +++ b/Source/EmberCommon/EmberCommon.h @@ -116,6 +116,7 @@ static bool InitPaletteList(const string& filename) { "./", #ifndef _WIN32 + "~" "~/.fractorium", "~/.config/fractorium", "/usr/share/fractorium", diff --git a/Source/Fractorium/FractoriumEmberController.cpp b/Source/Fractorium/FractoriumEmberController.cpp index 4ec0dcd..cb184c4 100644 --- a/Source/Fractorium/FractoriumEmberController.cpp +++ b/Source/Fractorium/FractoriumEmberController.cpp @@ -63,8 +63,10 @@ FractoriumEmberController::FractoriumEmberController(Fractorium* fractorium) QDir::currentPath().toLocal8Bit().data(), QDir::homePath().toLocal8Bit().data(), QCoreApplication::applicationDirPath().toLocal8Bit().data(), - QString("/usr/local/share/fractorium").toLocal8Bit().data(), - QString("/usr/share/fractorium").toLocal8Bit().data() + QString("~/.fractorium").toLocal8Bit().data(), + QString("~/.config/fractorium").toLocal8Bit().data(), + QString("/usr/share/fractorium").toLocal8Bit().data(), + QString("/usr/local/share/fractorium").toLocal8Bit().data() }; for (auto& path : paths) @@ -349,7 +351,11 @@ void FractoriumEmberController::SetEmberPrivate(const Ember& ember, bool v } static EmberToXml writer;//Save parameters of last full render just in case there is a crash. +#ifdef _WIN32 string filename = "last.flame"; +#else + string filename = "~/.config/fractorium/last.flame"; +#endif writer.Save(filename.c_str(), m_Ember, 0, true, false, true); m_GLController->ResetMouseState(); FillXforms();//Must do this first because the palette setup in FillParamTablesAndPalette() uses the xforms combo.