Don't double-terminate a display.

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

Don't double-terminate a display.
10e7e501 · Geoff Lang · Commit Bot · 01e83581 · 10e7e501
Commit 10e7e501 authored May 15, 2018 by Geoff Lang Committed by Commit Bot May 15, 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
@@ -526,6 +526,11 @@ Error Display::initialize()
 Error Display::terminate()
 {
+    if (!mInitialized)
+    {
+        return NoError();
+    }
    ANGLE_TRY(makeCurrent(nullptr, nullptr, nullptr));
    mMemoryProgramCache.clear();