Code Review
/
apps
/
agl-service-windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove comment out code
[apps/agl-service-windowmanager.git]
/
src
/
main.cpp
diff --git
a/src/main.cpp
b/src/main.cpp
index
332a158
..
9350634
100644
(file)
--- a/
src/main.cpp
+++ b/
src/main.cpp
@@
-38,7
+38,7
@@
typedef struct WMClientCtxt
WMClientCtxt(const char *appName, const char* appRole)
{
name = appName;
WMClientCtxt(const char *appName, const char* appRole)
{
name = appName;
- role =
r
ole;
+ role =
appR
ole;
}
} WMClientCtxt;
}
} WMClientCtxt;
@@
-197,6
+197,18
@@
static void cbRemoveClientCtxt(void *data)
if (pSid)
{
auto sid = *pSid;
if (pSid)
{
auto sid = *pSid;
+ auto o_state = *g_afb_instance->app.layers.get_layout_state(sid);
+ if (o_state != nullptr)
+ {
+ if (o_state->main == sid)
+ {
+ o_state->main = -1;
+ }
+ else if (o_state->sub == sid)
+ {
+ o_state->sub = -1;
+ }
+ }
g_afb_instance->app.id_alloc.remove_id(sid);
g_afb_instance->app.layers.remove_surface(sid);
g_afb_instance->app.controller->sprops.erase(sid);
g_afb_instance->app.id_alloc.remove_id(sid);
g_afb_instance->app.layers.remove_surface(sid);
g_afb_instance->app.controller->sprops.erase(sid);
@@
-364,7
+376,8
@@
void windowmanager_activatesurface(afb_req req) noexcept
}
catch (std::exception &e)
{
}
catch (std::exception &e)
{
- HMI_WARNING("wm", "failed", "Uncaught exception while calling activatesurface: %s", e.what());
+ HMI_WARNING("wm", "failed: Uncaught exception while calling activatesurface: %s", e.what());
+ g_afb_instance->app.exeptionProcessForTransition();
return;
}
}
return;
}
}
@@
-404,7
+417,8
@@
void windowmanager_deactivatesurface(afb_req req) noexcept
}
catch (std::exception &e)
{
}
catch (std::exception &e)
{
- HMI_WARNING("wm", "Uncaught exception while calling deactivatesurface: %s", e.what());
+ HMI_WARNING("wm", "failed: Uncaught exception while calling deactivatesurface: %s", e.what());
+ g_afb_instance->app.exeptionProcessForTransition();
return;
}
}
return;
}
}
@@
-436,7
+450,8
@@
void windowmanager_enddraw(afb_req req) noexcept
}
catch (std::exception &e)
{
}
catch (std::exception &e)
{
- HMI_WARNING("wm", "failed", "Uncaught exception while calling enddraw: %s", e.what());
+ HMI_WARNING("wm", "failed: Uncaught exception while calling enddraw: %s", e.what());
+ g_afb_instance->app.exeptionProcessForTransition();
return;
}
}
return;
}
}