From: Hwankyu Jhun <h.jhun@samsung.com>
Date: Fri, 17 Apr 2020 05:18:08 +0000 (+0900)
Subject: Merge branch 'tizen' into tizen_5.5
X-Git-Tag: submit/tizen_5.5/20200417.051636^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9a7c91565a1e8b8693e81b8e2ffb66e215a85c33;p=platform%2Fcore%2Fappfw%2Fwidget-viewer.git

Merge branch 'tizen' into tizen_5.5

Change-Id: Ida30ce4f794cc11cb23d375427538ee26ddbbbb7
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
---

9a7c91565a1e8b8693e81b8e2ffb66e215a85c33
diff --cc frame-broker/src/frame_broker.c
index d09aa9c1,d1670498..9711ba23
--- a/frame-broker/src/frame_broker.c
+++ b/frame-broker/src/frame_broker.c
@@@ -178,22 -147,12 +147,18 @@@ static void __scls_stop_cb(uint32_t ser
  	uint32_t ctx_serial = 0;
  
  	_D("[__SCLS__] Stop");
- 	if (context == NULL) {
- 		if (broker->pre_context) {
- 			__check_pre_context(broker);
- 			context = broker->context;
- 		} else {
- 			_E("Invalid context");
- 			return;
- 		}
+ 	frame_context_get_serial(context, &ctx_serial);
+ 	if (ctx_serial != serial) {
+ 		_W("Skip! serial(%u:%u)", ctx_serial, serial);
+ 		return;
  	}
  
 +	frame_context_get_serial(context, &ctx_serial);
 +	if (ctx_serial != serial) {
 +		_W("Skip! serial(%u:%u)", ctx_serial, serial);
 +		return;
 +	}
 +
  	_D("Destroy context");
  	frame_context_destroy(context);
  	broker->context = NULL;