Fix Gee.List.Iterator.next

1 files changed, 24 insertions, 12 deletions

diff --git a/gee/linkedlist.vala b/gee/linkedlist.vala
index 5c9cfd3..3167eff 100644
--- a/gee/linkedlist.vala
+++ b/gee/linkedlist.vala
@@ -424,18 +424,30 @@ public class Gee.LinkedList<G> : AbstractList<G>, Queue<G>, Deque<G> {
 		public bool next () {
 			assert (this._stamp == this._list._stamp);
 
-			if (this.removed && this.position != null) {
-				this.removed = false;
-				return true;
-			} else if (!this.started && this._list._head != null) {
-				this.started = true;
-				this.position = this._list._head;
-				this._index++;
-				return true;
-			} else if (this.position != null && this.position.next != null) {
-				this.position = this.position.next;
-				this._index++;
-				return true;
+			if (this.removed) {
+				if (this.position != null) {
+					this.removed = false;
+					return true;
+				} else {
+					return false;
+				}
+			} else if (!this.started) {
+				if (this._list._head != null) {
+					this.started = true;
+					this.position = this._list._head;
+					this._index++;
+					return true;
+				} else {
+					return false;
+				}
+			} else if (this.position != null) {
+				if (this.position.next != null) {
+					this.position = this.position.next;
+					this._index++;
+					return true;
+				} else {
+					return false;
+				}
 			}
 			return false;
 		}