From 65cf0744c0f1a79bc1556a83c2836cd128c00d0a Mon Sep 17 00:00:00 2001
From: Marcel Greter <marcel.greter@ocbnet.ch>
Date: Fri, 12 Jun 2015 17:47:07 +0200
Subject: [PATCH] Improve function call return value handling

Fixes https://github.com/sass/libsass/issues/1269
---
 eval.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/eval.cpp b/eval.cpp
index 3833dcc3fa..5285f75528 100644
--- a/eval.cpp
+++ b/eval.cpp
@@ -685,10 +685,8 @@ namespace Sass {
     if (result->pstate().file == string::npos)
       result->pstate(c->pstate());
 
-    do {
-      result->is_delayed(result->concrete_type() == Expression::STRING);
-      result = result->perform(this);
-    } while (result->concrete_type() == Expression::NONE);
+    result->is_delayed(result->concrete_type() == Expression::STRING);
+    if (!result->is_delayed()) result = result->perform(this);
     exp.env_stack.pop_back();
     return result;
   }