napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unbreak locating of config file when run without --config

Browse Source
This commit is contained in:
Aurélien Gâteau 2014-07-28 18:36:24 +02:00
parent 289704ab90
commit d30b6300ab
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libcalamares/utils/CalamaresUtils.cpp
View File

@ -34,7 +34,7 @@
namespace CalamaresUtils namespace CalamaresUtils
{ {
static QDir s_appDataDir; static QDir s_appDataDir( CMAKE_INSTALL_FULL_DATADIR );
void void
setAppDataDir( const QDir& dir ) setAppDataDir( const QDir& dir )
@ -46,13 +46,6 @@ setAppDataDir( const QDir& dir )
QDir QDir
appDataDir() appDataDir()
{ {
if ( s_appDataDir.path().isEmpty() )
{
s_appDataDir = QDir( CMAKE_INSTALL_FULL_DATADIR );
if ( !s_appDataDir.exists() || !s_appDataDir.isReadable() )
s_appDataDir.mkpath( s_appDataDir.absolutePath() );
}
return s_appDataDir; return s_appDataDir;
} }