Commit 566b1c0e authored by Ronan Abhamon's avatar Ronan Abhamon

fix(src/app/App): do not create linphone config when prefered language is fetched

parent 6cca4d14
...@@ -83,7 +83,7 @@ App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true) { ...@@ -83,7 +83,7 @@ App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true) {
// Try to use preferred locale. // Try to use preferred locale.
QString locale = ::Utils::coreStringToAppString( QString locale = ::Utils::coreStringToAppString(
linphone::Config::newWithFactory( linphone::Config::newWithFactory(
Paths::getConfigFilePath(mParser.value("config")), "")->getString( Paths::getConfigFilePath(mParser.value("config"), false), "")->getString(
SettingsModel::UI_SECTION, "locale", "" SettingsModel::UI_SECTION, "locale", ""
) )
); );
......
...@@ -175,11 +175,12 @@ string Paths::getCapturesDirPath () { ...@@ -175,11 +175,12 @@ string Paths::getCapturesDirPath () {
return getWritableDirPath(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + PATH_CAPTURES); return getWritableDirPath(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + PATH_CAPTURES);
} }
string Paths::getConfigFilePath (const QString &configPath) { string Paths::getConfigFilePath (const QString &configPath, bool writable) {
if (!configPath.isEmpty()) const QString &path = configPath.isEmpty()
return getWritableFilePath(QFileInfo(configPath).absoluteFilePath()); ? getAppConfigFilePath()
: QFileInfo(configPath).absoluteFilePath();
return getWritableFilePath(getAppConfigFilePath()); return writable ? getWritableFilePath(path) : getReadableFilePath(path);
} }
string Paths::getFactoryConfigFilePath () { string Paths::getFactoryConfigFilePath () {
......
...@@ -36,7 +36,7 @@ namespace Paths { ...@@ -36,7 +36,7 @@ namespace Paths {
std::string getAvatarsDirPath (); std::string getAvatarsDirPath ();
std::string getCallHistoryFilePath (); std::string getCallHistoryFilePath ();
std::string getCapturesDirPath (); std::string getCapturesDirPath ();
std::string getConfigFilePath (const QString &configPath = QString()); std::string getConfigFilePath (const QString &configPath = QString(), bool writable = true);
std::string getFactoryConfigFilePath (); std::string getFactoryConfigFilePath ();
std::string getFriendsListFilePath (); std::string getFriendsListFilePath ();
std::string getDownloadDirPath (); std::string getDownloadDirPath ();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment