diff --git a/contrib/src/stc/scintilla/src/Editor.cxx b/contrib/src/stc/scintilla/src/Editor.cxx
index 44399a5fb0..e6b7df0be1 100644
--- a/contrib/src/stc/scintilla/src/Editor.cxx
+++ b/contrib/src/stc/scintilla/src/Editor.cxx
@@ -1,6 +1,7 @@
 // Scintilla source code edit control
 /** @file Editor.cxx
  ** Main code for the edit control.
+	Last change:  JS   18 Jun 103    1:08 am
  **/
 // Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
@@ -2353,6 +2354,11 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) {
 		}
 	}
 
+        // Workaround by JACS: sometimes due to a re-entry condition,
+        // pixmapLine becomes uninitialised, followed by a crash.
+        if (!pixmapLine->Initialised())
+                return;
+
 	PRectangle rcRightMargin = rcClient;
 	rcRightMargin.left = rcRightMargin.right - vs.rightMarginWidth;
 	if (rcArea.Intersects(rcRightMargin)) {
diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx
index 44399a5fb0..e6b7df0be1 100644
--- a/src/stc/scintilla/src/Editor.cxx
+++ b/src/stc/scintilla/src/Editor.cxx
@@ -1,6 +1,7 @@
 // Scintilla source code edit control
 /** @file Editor.cxx
  ** Main code for the edit control.
+	Last change:  JS   18 Jun 103    1:08 am
  **/
 // Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
@@ -2353,6 +2354,11 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) {
 		}
 	}
 
+        // Workaround by JACS: sometimes due to a re-entry condition,
+        // pixmapLine becomes uninitialised, followed by a crash.
+        if (!pixmapLine->Initialised())
+                return;
+
 	PRectangle rcRightMargin = rcClient;
 	rcRightMargin.left = rcRightMargin.right - vs.rightMarginWidth;
 	if (rcArea.Intersects(rcRightMargin)) {