From 76e119f8ad700c6f9df1096a012cca3beda4d9ff Mon Sep 17 00:00:00 2001 From: Geoffrey McRae Date: Tue, 11 Aug 2020 14:54:48 +1000 Subject: [PATCH] [client] egl: don't fade the splash when restarting --- VERSION | 2 +- client/renderers/EGL/egl.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index b9f3d06b..c711f642 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -B2-rc3-11-gfa50b7824c+1 \ No newline at end of file +B2-rc3-12-gbfb12c74fb+1 \ No newline at end of file diff --git a/client/renderers/EGL/egl.c b/client/renderers/EGL/egl.c index b9a59b32..cd410690 100644 --- a/client/renderers/EGL/egl.c +++ b/client/renderers/EGL/egl.c @@ -233,8 +233,6 @@ void egl_on_restart(void * opaque) eglDestroyContext(this->display, this->frameContext); this->frameContext = NULL; this->start = false; - this->waitFadeTime = 0; - this->waitDone = false; } void egl_on_resize(void * opaque, const int width, const int height, const LG_RendererRect destRect) @@ -575,6 +573,11 @@ bool egl_render(void * opaque, SDL_Window * window) if (!this->waitDone) egl_splash_render(this->splash, a, this->splashRatio); } + else + { + if (!this->start) + egl_splash_render(this->splash, 1.0f, this->splashRatio); + } if (this->showAlert) {