From 4337e776697b4add3c1fc6c4178542c7c76d0ad5 Mon Sep 17 00:00:00 2001 From: Daniel Zaoui Date: Tue, 29 Aug 2017 15:21:09 +0300 Subject: [PATCH] Fix PS3 backend removal (Cedric...) When running elementary_test with ELM_ENGINE='buffer', we got a crash. The removal of PS3 backend patch didn't remove ELM_SOFTWARE_PSL1GHT and didn't shift the _elm_engines indexes. ELM_SOFTWARE_DDRAW stayed at the index 13 (value NULL) instead of moving to index 12. A strcmp with NULL occurred, leading to the crash. @Cedric, I excuse you to not have run Exactness your code before pushing :P --- src/lib/elementary/elm_priv.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h index de82ec207c..8bedeb0819 100644 --- a/src/lib/elementary/elm_priv.h +++ b/src/lib/elementary/elm_priv.h @@ -154,11 +154,10 @@ extern const char *_elm_engines[]; #define ELM_BUFFER (_elm_engines[6]) #define ELM_EWS (_elm_engines[7]) #define ELM_OPENGL_COCOA (_elm_engines[8]) -#define ELM_SOFTWARE_PSL1GHT (_elm_engines[9]) -#define ELM_WAYLAND_SHM (_elm_engines[10]) -#define ELM_WAYLAND_EGL (_elm_engines[11]) -#define ELM_DRM (_elm_engines[12]) -#define ELM_SOFTWARE_DDRAW (_elm_engines[13]) +#define ELM_WAYLAND_SHM (_elm_engines[9]) +#define ELM_WAYLAND_EGL (_elm_engines[10]) +#define ELM_DRM (_elm_engines[11]) +#define ELM_SOFTWARE_DDRAW (_elm_engines[12]) #define ELM_FONT_TOKEN_STYLE ":style="