From d30b6300ab03f0c8f9ad3441b995249f87442211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= Date: Mon, 28 Jul 2014 18:36:24 +0200 Subject: [PATCH] Unbreak locating of config file when run without --config --- src/libcalamares/utils/CalamaresUtils.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/libcalamares/utils/CalamaresUtils.cpp b/src/libcalamares/utils/CalamaresUtils.cpp index cfb374273..ec158b6bc 100644 --- a/src/libcalamares/utils/CalamaresUtils.cpp +++ b/src/libcalamares/utils/CalamaresUtils.cpp @@ -34,7 +34,7 @@ namespace CalamaresUtils { -static QDir s_appDataDir; +static QDir s_appDataDir( CMAKE_INSTALL_FULL_DATADIR ); void setAppDataDir( const QDir& dir ) @@ -46,13 +46,6 @@ setAppDataDir( const QDir& dir ) QDir 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; }