mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-01 10:30:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Bug fixes

Browse Source 
-Place last.flame in ~/.config/fractorium on Linux.
This commit is contained in:
mfeemster 2016-03-07 18:38:47 -08:00
parent f4ea6c3959
commit 243ad605f1
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/EmberCommon/EmberCommon.h
View File

@ -116,6 +116,7 @@ static bool InitPaletteList(const string& filename)
{ {
"./", "./",
#ifndef _WIN32 #ifndef _WIN32
"~"
"~/.fractorium", "~/.fractorium",
"~/.config/fractorium", "~/.config/fractorium",
"/usr/share/fractorium", "/usr/share/fractorium",

10
Source/Fractorium/FractoriumEmberController.cpp
View File

@ -63,8 +63,10 @@ FractoriumEmberController<T>::FractoriumEmberController(Fractorium* fractorium)
QDir::currentPath().toLocal8Bit().data(), QDir::currentPath().toLocal8Bit().data(),
QDir::homePath().toLocal8Bit().data(), QDir::homePath().toLocal8Bit().data(),
QCoreApplication::applicationDirPath().toLocal8Bit().data(), QCoreApplication::applicationDirPath().toLocal8Bit().data(),
QString("/usr/local/share/fractorium").toLocal8Bit().data(), QString("~/.fractorium").toLocal8Bit().data(),
QString("/usr/share/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) for (auto& path : paths)
@ -349,7 +351,11 @@ void FractoriumEmberController<T>::SetEmberPrivate(const Ember<U>& ember, bool v
} }
static EmberToXml<T> writer;//Save parameters of last full render just in case there is a crash. static EmberToXml<T> writer;//Save parameters of last full render just in case there is a crash.
#ifdef _WIN32
string filename = "last.flame"; string filename = "last.flame";
#else
string filename = "~/.config/fractorium/last.flame";
#endif
writer.Save(filename.c_str(), m_Ember, 0, true, false, true); writer.Save(filename.c_str(), m_Ember, 0, true, false, true);
m_GLController->ResetMouseState(); m_GLController->ResetMouseState();
FillXforms();//Must do this first because the palette setup in FillParamTablesAndPalette() uses the xforms combo. FillXforms();//Must do this first because the palette setup in FillParamTablesAndPalette() uses the xforms combo.