Merge pull request #17 from gussenov/fix-crash-on-stop

Ata Kuyumcu · web-flow · commit cb88344a1d6e · 2021-04-26T11:41:02.000+03:00
Fix crash on stop
diff --git a/src/countly.cpp b/src/countly.cpp
@@ -225,11 +225,6 @@ void Countly::startOnCloud(const std::string& app_key) {
 
 void Countly::stop() {
 	mutex.lock();
-	if (began_session) {
-		mutex.unlock();
-		endSession();
-		mutex.lock();
-	}
 	stop_thread = true;
 	mutex.unlock();
 	if (thread != nullptr && thread->joinable()) {
@@ -240,6 +235,9 @@ void Countly::stop() {
 		}
 		delete thread;
 	}
+	if (began_session) {
+		endSession();
+	}
 }
 
 void Countly::setUpdateInterval(size_t milliseconds) {

Original file line number	Diff line number	Diff line change
`@@ -225,11 +225,6 @@ void Countly::startOnCloud(const std::string& app_key) {`
`225`	`225`
`226`	`226`	`void Countly::stop() {`
`227`	`227`	`mutex.lock();`
`228`		`- if (began_session) {`
`229`		`- mutex.unlock();`
`230`		`- endSession();`
`231`		`- mutex.lock();`
`232`		`- }`
`233`	`228`	`stop_thread = true;`
`234`	`229`	`mutex.unlock();`
`235`	`230`	`if (thread != nullptr && thread->joinable()) {`
`@@ -240,6 +235,9 @@ void Countly::stop() {`
`240`	`235`	`}`
`241`	`236`	`delete thread;`
`242`	`237`	`}`
	`238`	`+ if (began_session) {`
	`239`	`+ endSession();`
	`240`	`+ }`
`243`	`241`	`}`
`244`	`242`
`245`	`243`	`void Countly::setUpdateInterval(size_t milliseconds) {`