Don't double-terminate a display.

Some dEQP tests call eglTerminate twice on the same display and cause crashes. BUG=angleproject:2546 Change-Id: I3118e07aec19a28ad2b76fc2705be5b0bea37857 Reviewed-on: https://chromium-review.googlesource.com/1066467Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

Don't double-terminate a display.
c1651618 · Geoff Lang · Commit Bot · 22a5f5f0 · c1651618
Commit c1651618 authored May 23, 2018 by Geoff Lang Committed by Commit Bot May 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

Display.cpp src/libANGLE/Display.cpp +5 -0

No files found.
--- a/src/libANGLE/Display.cpp
+++ b/src/libANGLE/Display.cpp
@@ -533,6 +533,11 @@ Error Display::initialize()

 Error Display::terminate()
 {
+    if (!mInitialized)
+    {
+        return NoError();
+    }
+
    ANGLE_TRY(makeCurrent(nullptr, nullptr, nullptr));

    mMemoryProgramCache.clear();