From 21b330dad19585ec6000d4ce385ebd8619dd07de Mon Sep 17 00:00:00 2001
From: Alexander Scharinger <rng.dynamics@gmail.com>
Date: Sat, 27 Mar 2021 22:45:49 +0100
Subject: [PATCH] Github bridge: fix message about timeout

---
 bridge/github/import.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bridge/github/import.go b/bridge/github/import.go
index ceb35ef0c533865ed24fd879dbec1ac596ae4c29..d2e5d65946985b587d53ced7ea44c95b04742592 100644
--- a/bridge/github/import.go
+++ b/bridge/github/import.go
@@ -67,7 +67,6 @@ func (gi *githubImporter) ImportAll(ctx context.Context, repo *cache.RepoCache,
 			if currEvent == nil {
 				break
 			}
-			nextEvent = gi.mediator.NextImportEvent()
 
 			switch event := currEvent.(type) {
 			case MessageEvent:
@@ -79,6 +78,7 @@ func (gi *githubImporter) ImportAll(ctx context.Context, repo *cache.RepoCache,
 					return
 				}
 				// second: create new issue
+				nextEvent = gi.mediator.NextImportEvent()
 				switch next := nextEvent.(type) {
 				case IssueEditEvent:
 					// consuming and using next event
@@ -100,6 +100,7 @@ func (gi *githubImporter) ImportAll(ctx context.Context, repo *cache.RepoCache,
 					return
 				}
 			case TimelineEvent:
+				nextEvent = gi.mediator.NextImportEvent()
 				if next, ok := nextEvent.(CommentEditEvent); ok && event.Typename == "IssueComment" {
 					// consuming and using next event
 					nextEvent = nil