From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Mon, 7 Jul 2014 07:57:08 +0000 (+0200)
Subject: Fix string templates
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74a7cffd3a95e70e24f11da691a70b8aceb75553;p=thirdparty%2Fvala.git

Fix string templates
---

diff --git a/vala/valacodetransformer.vala b/vala/valacodetransformer.vala
index c2c84a5d1..70b9aa17b 100644
--- a/vala/valacodetransformer.vala
+++ b/vala/valacodetransformer.vala
@@ -295,7 +295,7 @@ public class Vala.CodeTransformer : CodeVisitor {
 	}
 
 	public Expression stringify (Expression expr) {
-		if (expr.value_type.data_type != null && expr.value_type.data_type.is_subtype_of (context.analyzer.string_type.data_type)) {
+		if (expr.value_type != null && expr.value_type.data_type != null && expr.value_type.data_type.is_subtype_of (context.analyzer.string_type.data_type)) {
 			return expr;
 		} else {
 			return expression (@"%?.to_string ()", {expr});