Backport: Bug [#2138]. Potential fix to Direct2D crash when updating driver.

Backport of changeset 7985:0ffb5afdbd7f.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/Editor.cxx b/src/Editor.cxx
index aec983f00..5da9f2b75 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -1748,7 +1748,13 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) {
 		}
 		RefreshPixMaps(surfaceWindow);	// In case pixmaps invalidated by scrollbar change
 	}
-	PLATFORM_ASSERT(marginView.pixmapSelPattern->Initialised());
+
+	if (!marginView.pixmapSelPattern->Initialised()) {
+		// When Direct2D is used, pixmap creation may fail with D2DERR_RECREATE_TARGET so
+		// abandon this paint to avoid further failures.
+		// Main drawing surface and pixmaps should be recreated by next paint.
+		return;
+	}
 
 	if (!view.bufferedDraw)
 		surfaceWindow->SetClip(rcArea);