From 353398c72a7d6e09d2efb0858bbb9a174be06fb4 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 27 Apr 2017 14:25:47 +0200 Subject: [PATCH] fix(src/components/settings/AccountSettingsModel): remove assert when null proxy is set --- .../src/components/settings/AccountSettingsModel.cpp | 2 -- .../src/externals/single-application/SingleApplication.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/linphone-desktop/src/components/settings/AccountSettingsModel.cpp b/linphone-desktop/src/components/settings/AccountSettingsModel.cpp index ff8493035..ef68af102 100644 --- a/linphone-desktop/src/components/settings/AccountSettingsModel.cpp +++ b/linphone-desktop/src/components/settings/AccountSettingsModel.cpp @@ -109,8 +109,6 @@ QVariantMap AccountSettingsModel::getProxyConfigDescription (const shared_ptr
  • &proxyConfig) { - Q_ASSERT(proxyConfig != nullptr); - CoreManager::getInstance()->getCore()->setDefaultProxyConfig(proxyConfig); emit accountSettingsUpdated(); } diff --git a/linphone-desktop/src/externals/single-application/SingleApplication.cpp b/linphone-desktop/src/externals/single-application/SingleApplication.cpp index 2f9833418..9d1261ee4 100644 --- a/linphone-desktop/src/externals/single-application/SingleApplication.cpp +++ b/linphone-desktop/src/externals/single-application/SingleApplication.cpp @@ -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);