From 0034ca4b7666f5d570eab4a9c275e373008b7c64 Mon Sep 17 00:00:00 2001
From: "Jerry (Xinyu Hou)" <xinyu@synergy-project.org>
Date: Tue, 12 Jul 2016 05:54:47 -0700
Subject: [PATCH] #5461 Caught all exceptions for activation

---
 src/gui/src/ActivationNotifier.cpp | 7 ++++++-
 src/gui/src/SetupWizard.cpp        | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/gui/src/ActivationNotifier.cpp b/src/gui/src/ActivationNotifier.cpp
index 7efe4e82..fb2fd465 100644
--- a/src/gui/src/ActivationNotifier.cpp
+++ b/src/gui/src/ActivationNotifier.cpp
@@ -32,5 +32,10 @@ void ActivationNotifier::setIdentity(QString identity)
 void ActivationNotifier::notify()
 {
 	CoreInterface coreInterface;
-	coreInterface.notifyActivation(m_Identity);
+	try {
+		coreInterface.notifyActivation(m_Identity);
+	}
+	catch (...) {
+		// catch all exceptions and fails silently
+	}
 }
diff --git a/src/gui/src/SetupWizard.cpp b/src/gui/src/SetupWizard.cpp
index a3a081fc..e6ada683 100644
--- a/src/gui/src/SetupWizard.cpp
+++ b/src/gui/src/SetupWizard.cpp
@@ -243,8 +243,7 @@ void SetupWizard::reject()
 	}
 
 	// treat cancel as skip
-	CoreInterface coreInterface;
-	coreInterface.notifyActivation("skip:unknown");
+	notifyActivation("skip:unknown");
 
 	QWizard::reject();
 }