diff options
| author | Chris Michael <cpmichael@osg.samsung.com> | 2015-12-04 10:47:44 -0500 |
|---|---|---|
| committer | Chris Michael <cpmichael@osg.samsung.com> | 2015-12-04 10:48:45 -0500 |
| commit | 1d876e8fbaafe7bf0469597f52b319fe919ac6b4 (patch) | |
| tree | daa2c8a243c2df37d2f021b4cd13720d4c77d8e0 | |
| parent | 3d7f5f6f6d537177b26cc60145c9c4abfe9e516b (diff) | |
| download | elementary-1d876e8fbaafe7bf0469597f52b319fe919ac6b4.tar.gz | |
elementary: Don't call ecore_wl2_shutdown unless we have a display
During _elm_config_sub_shutdown we were explicitly calling
ecore_wl2_shutdown. We should only be doing this if we are actually in
a wayland environment.
@fix
Signed-off-by: Chris Michael <cpmichael@osg.samsung.com>
| -rw-r--r-- | src/lib/elm_config.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c index 5b1fa2f51..22b490938 100644 --- a/src/lib/elm_config.c +++ b/src/lib/elm_config.c @@ -3327,8 +3327,11 @@ _elm_config_sub_shutdown(void) if (ecore_x_display_get()) ecore_x_shutdown(); #endif #ifdef HAVE_ELEMENTARY_WL2 - if (_elm_wl_display) ecore_wl2_display_disconnect(_elm_wl_display); - ecore_wl2_shutdown(); + if (_elm_wl_display) + { + ecore_wl2_display_disconnect(_elm_wl_display); + ecore_wl2_shutdown(); + } #endif #ifdef HAVE_ELEMENTARY_WIN32 ecore_win32_shutdown(); |