From 19c0b301029478a62f332f259c9da04fb4ee8d65 Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Fri, 21 Feb 2020 17:25:33 -0500
Subject: [PATCH] manager: put preferences unserialize series into try catch
Change-Id: I08811c81925a688fba6a6da069f66ed56ac3b04d
---
src/manager.cpp | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/manager.cpp b/src/manager.cpp
index 1939195ded..4e51970a06 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -2697,20 +2697,19 @@ Manager::loadAccountOrder() const
int
Manager::loadAccountMap(const YAML::Node& node)
{
- // build preferences
- preferences.unserialize(node);
- voipPreferences.unserialize(node);
- hookPreference.unserialize(node);
- audioPreference.unserialize(node);
- shortcutPreferences.unserialize(node);
-
int errorCount = 0;
try {
+ // build preferences
+ preferences.unserialize(node);
+ voipPreferences.unserialize(node);
+ hookPreference.unserialize(node);
+ audioPreference.unserialize(node);
+ shortcutPreferences.unserialize(node);
#ifdef ENABLE_VIDEO
videoPreferences.unserialize(node);
#endif
} catch (const YAML::Exception &e) {
- JAMI_ERR("%s: No video node in config file", e.what());
+ JAMI_ERR("%s: Preferences node unserialize error: ", e.what());
++errorCount;
}
--
GitLab