From 2ebc659bcf6e70ebba7f01fc8b594c55b5e12efc Mon Sep 17 00:00:00 2001
From: lopelex <lopelex@gmx.de>
Date: Mon, 3 Oct 2022 16:28:42 +0200
Subject: [PATCH] fix conflicts with #62

---
 cbpi/controller/upload_controller.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cbpi/controller/upload_controller.py b/cbpi/controller/upload_controller.py
index 5faccb3..d5c15d4 100644
--- a/cbpi/controller/upload_controller.py
+++ b/cbpi/controller/upload_controller.py
@@ -194,7 +194,7 @@ class UploadController:
 
                 # get the hop addition times
 
-                c.execute('SELECT Zeit FROM Hopfengaben WHERE Vorderwuerze <> 1 AND SudID = ?', (Recipe_ID,))
+                c.execute('SELECT Zeit, Name FROM Hopfengaben WHERE Vorderwuerze <> 1 AND SudID = ?', (Recipe_ID,))
                 hops = c.fetchall()
                 whirlpool = []
                 for hop in hops: