From 313bff7affbe76340635ebcfd2d29277a2d1b603 Mon Sep 17 00:00:00 2001
From: Marc Jansen <jansen@terrestris.de>
Date: Fri, 9 Oct 2015 16:07:46 +0200
Subject: [PATCH] Merge pull request #4242 from
 marcjansen/fix-drawtext-regression

Fix a drawText regression introduced with 31a68e2
---
 src/ol/render/canvas/canvasreplay.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js
index d5cd9b7035..3c3f091b85 100644
--- a/src/ol/render/canvas/canvasreplay.js
+++ b/src/ol/render/canvas/canvasreplay.js
@@ -1560,10 +1560,8 @@ goog.inherits(ol.render.canvas.TextReplay, ol.render.canvas.Replay);
  */
 ol.render.canvas.TextReplay.prototype.drawText =
     function(flatCoordinates, offset, end, stride, geometry, feature) {
-  if (this.text_ === '' ||
-      !this.textState_ ||
-      (this.textFillState_ &&
-       !this.textStrokeState_)) {
+  if (this.text_ === '' || !this.textState_ ||
+      (!this.textFillState_ && !this.textStrokeState_)) {
     return;
   }
   if (this.textFillState_) {