From e6dd2b80da2ed3750c962a6840d9336a5b5d5e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Wed, 30 Oct 2013 08:59:55 -0700 Subject: [PATCH] Fall back to ANIMATION_NONE if startup-animation is zoom get_animation_type() parses "none", "zoom" and "fade" but for the startup animation, we only support "none" and "fade". If we get "zoom" just fall back to "none" like we do for all unrecognized strings. https://bugs.freedesktop.org/show_bug.cgi?id=71006 --- src/shell.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/shell.c b/src/shell.c index e0c352724..d1645bdf1 100644 --- a/src/shell.c +++ b/src/shell.c @@ -450,6 +450,9 @@ shell_configuration(struct desktop_shell *shell) "startup-animation", &s, "fade"); shell->startup_animation_type = get_animation_type(s); free(s); + if (shell->startup_animation_type == ANIMATION_ZOOM) + shell->startup_animation_type = ANIMATION_NONE; + weston_config_section_get_uint(section, "num-workspaces", &shell->workspaces.num, DEFAULT_NUM_WORKSPACES);