fix bug 34166

1b72bd2f · Oleg Korshul · b712a0f9 · 1b72bd2f · 1b72bd2f
Commit 1b72bd2f authored Mar 21, 2017 by Oleg Korshul
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

word/Drawing/DrawingDocument.js word/Drawing/DrawingDocument.js +1 -1

word/api.js word/api.js +5 -0

No files found.
--- a/word/Drawing/DrawingDocument.js
+++ b/word/Drawing/DrawingDocument.js
@@ -5495,7 +5495,7 @@ function CDrawingDocument()
 			this.GuiCanvasFillTextureCtx.drawImage(_img.Image, _x, _y, _w, _h);
 		}
-		else
+		else if (!_img || !_img.Image)
 		{
 			this.GuiCanvasFillTextureCtx.lineWidth = 1;

--- a/word/api.js
+++ b/word/api.js
@@ -5863,6 +5863,11 @@ background-repeat: no-repeat;\
 	asc_docs_api.prototype.asyncImageEndLoadedBackground = function(_image)
 	{
 		this.WordControl.m_oDrawingDocument.CheckRasterImageOnScreen(_image.src);
+		if (this.WordControl.m_oDrawingDocument.LastDrawingUrl == _image.src)
+		{
+			this.WordControl.m_oDrawingDocument.LastDrawingUrl = "";
+			this.UpdateInterfaceState();
+		}
 	};
 	asc_docs_api.prototype.IsAsyncOpenDocumentImages     = function()
 	{