From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sun, 8 Mar 2020 09:41:16 +0000 (+0100)
Subject: vala: Fix search for Parameter.base_parameter
X-Git-Tag: 0.48.1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0284c5d33b76d2d696c33271df160810e3370374;p=thirdparty%2Fvala.git

vala: Fix search for Parameter.base_parameter
---

diff --git a/vala/valaparameter.vala b/vala/valaparameter.vala
index 052b06ce8..f99f484da 100644
--- a/vala/valaparameter.vala
+++ b/vala/valaparameter.vala
@@ -210,8 +210,13 @@ public class Vala.Parameter : Variable {
 
 		unowned Method? m = parent_symbol as Method;
 		if (m != null) {
-			unowned Method? base_method = m.base_method != null ? m.base_method : m.base_interface_method;
-			if (base_method != null && base_method != m) {
+			unowned Method? base_method = null;
+			if (m.base_method != null && m.base_method != m) {
+				base_method = m.base_method;
+			} else if (m.base_interface_method != null && m.base_interface_method != m) {
+				base_method = m.base_interface_method;
+			}
+			if (base_method != null) {
 				int index = m.get_parameters ().index_of (this);
 				if (index >= 0) {
 					base_parameter = base_method.get_parameters ().get (index);