From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sun, 12 Feb 2017 18:57:38 +0000 (+0100)
Subject: Fix broken 20a1536f9911c1aadbfbe046bc01afc57bb724a5
X-Git-Tag: 0.35.4~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b2e0c292450ea025f2911a05a3b2b36d2f3552c;p=thirdparty%2Fvala.git

Fix broken 20a1536f9911c1aadbfbe046bc01afc57bb724a5

https://bugzilla.gnome.org/show_bug.cgi?id=777697
---

diff --git a/vala/valafield.vala b/vala/valafield.vala
index 3af9433d6..88f80905d 100644
--- a/vala/valafield.vala
+++ b/vala/valafield.vala
@@ -151,8 +151,8 @@ public class Vala.Field : Variable, Lockable {
 				return false;
 			}
 
-			if (parent_symbol is Namespace && initializer.is_constant ()) {
-				if ((variable_type.nullable || nitializer.is_non_null ()) && (variable_type.value_owned || variable_type.is_disposable ())) {
+			if (parent_symbol is Namespace && initializer.is_constant () && initializer.is_non_null ()) {
+				if (variable_type.is_disposable () && variable_type.value_owned) {
 					error = true;
 					Report.error (source_reference, "Owned namespace fields can only be initialized in a function or method");
 					return false;