mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 19:38:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crashes when starting the application if no linphonerc file exists yet.

Browse source
This commit is contained in:
Ghislain MARY 2017-07-04 17:56:42 +02:00
parent dd84961b73
commit 39cc76d46b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/other/colors/Colors.cpp
View file

@ -71,7 +71,7 @@ void Colors::overrideColors (const shared_ptr<linphone::Config> &config) {
for (int i = info->propertyOffset(); i < info->propertyCount(); ++i) {
const QMetaProperty metaProperty = info->property(i);
const string colorName = metaProperty.name();
const string colorValue = config->getString(COLORS_SECTION, colorName, "");
const string colorValue = config ? config->getString(COLORS_SECTION, colorName, "") : "";
if (!colorValue.empty())
setProperty(colorName.c_str(), QColor(::Utils::coreStringToAppString(colorValue)));

8
src/components/settings/SettingsModel.cpp
View file

@ -773,11 +773,11 @@ void SettingsModel::setLogsEmail (const QString &email) {
// ---------------------------------------------------------------------------
QString SettingsModel::getLogsFolder (const shared_ptr<linphone::Config> &config) {
return ::Utils::coreStringToAppString(
config->getString(UI_SECTION, "logs_folder", Paths::getLogsDirPath())
);
return ::Utils::coreStringToAppString(config
? config->getString(UI_SECTION, "logs_folder", Paths::getLogsDirPath())
: Paths::getLogsDirPath());
}
bool SettingsModel::getLogsEnabled (const shared_ptr<linphone::Config> &config) {
return config->getInt(UI_SECTION, "logs_enabled", false);
return config ? config->getInt(UI_SECTION, "logs_enabled", false) : false;
}