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

fix(src/components/settings/AccountSettingsModel): remove assert when null proxy is set

Browse source
This commit is contained in:
Ronan Abhamon 2017-04-27 14:25:47 +02:00
parent 5a149a729d
commit 353398c72a
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-desktop/src/components/settings/AccountSettingsModel.cpp
View file

@ -109,8 +109,6 @@ QVariantMap AccountSettingsModel::getProxyConfigDescription (const shared_ptr<li
}
void AccountSettingsModel::setDefaultProxyConfig (const shared_ptr<linphone::ProxyConfig> &proxyConfig) {
Q_ASSERT(proxyConfig != nullptr);
CoreManager::getInstance()->getCore()->setDefaultProxyConfig(proxyConfig);
emit accountSettingsUpdated();
}

2
linphone-desktop/src/externals/single-application/SingleApplication.cpp vendored
View file

@ -256,7 +256,7 @@ void SingleApplicationPrivate::connectToPrimary (int msecs, char connectionType)
cout << "[PROCESS ABNORMALLY TERMINATED]: " << signum << endl;
#ifdef Q_OS_LINUX
cout << "Please to remove your ~/.ICEauthority file and rerun." << endl;
cout << "If you have used valgrind, please remove your ~/.ICEauthority file and rerun." << endl;
#endif // ifdef Q_OS_UNIX
::exit(128 + signum);