X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/556f51f104fbbb5bd0d51b61a18d7e5af2759079..36eef8ab7ec7c90e97f2371d7ca8c80d52fd3e27:/merge.c

diff --git a/merge.c b/merge.c
index cfe2d97..7f1773e 100644
--- a/merge.c
+++ b/merge.c
@@ -10,9 +10,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "decodekey.h"
 #include "keydb.h"
 #include "keyid.h"
-#include "keyindex.h"
 #include "keystructs.h"
 #include "ll.h"
 #include "mem.h"
@@ -394,9 +394,9 @@ int update_keys(struct openpgp_publickey **keys, bool verbose)
 					*keys = curkey->next;
 				} else {
 					prev->next = curkey->next;
-					prev = curkey->next;
 					curkey->next = NULL;
 					free_publickey(curkey);
+					curkey = prev;
 				}
 			} else {
 				prev = curkey;