mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-12 15:58:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Bug fixes

Browse Source 
-Try yet again to place last.flame in ~/.config/Fractorium on Linux.
 -Remove ~/.Fractorium as a search path on Linux, it's non-standard.
This commit is contained in:
mfeemster 2016-03-08 20:37:19 -08:00
parent c067568781
commit 787388a3dd
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/EmberCommon/EmberCommon.h
View File

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

5
Source/Fractorium/FractoriumEmberController.cpp
View File

@ -63,7 +63,6 @@ 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("~/.Fractorium").toLocal8Bit().data(),
QString("~/.config/Fractorium").toLocal8Bit().data(), QString("~/.config/Fractorium").toLocal8Bit().data(),
QString("/usr/share/fractorium").toLocal8Bit().data(), QString("/usr/share/fractorium").toLocal8Bit().data(),
QString("/usr/local/share/fractorium").toLocal8Bit().data() QString("/usr/local/share/fractorium").toLocal8Bit().data()
@ -354,12 +353,12 @@ void FractoriumEmberController<T>::SetEmberPrivate(const Ember<U>& ember, bool v
#ifdef _WIN32 #ifdef _WIN32
string filename = "last.flame"; string filename = "last.flame";
#else #else
QDir dir("~/.config/Fractorium"); QDir dir(QDir::homePath() + "/.config/Fractorium");
if (!dir.exists()) if (!dir.exists())
dir.mkpath("."); dir.mkpath(".");
string filename = "~/.config/Fractorium/last.flame"; string filename = QDir::homePath().toStdString() + "/.config/Fractorium/last.flame";
#endif #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();