From e9ef5296e7b264f9d726b170b3338bb03d862562 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 29 Mar 2019 13:16:23 +0530
Subject: [PATCH] Fix #1821968 [Epub Catalog using some former
 value](https://bugs.launchpad.net/calibre/+bug/1821968)

---
 src/calibre/gui2/catalog/catalog_epub_mobi.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/catalog/catalog_epub_mobi.py b/src/calibre/gui2/catalog/catalog_epub_mobi.py
index a0ef67f659..20977b9cfd 100644
--- a/src/calibre/gui2/catalog/catalog_epub_mobi.py
+++ b/src/calibre/gui2/catalog/catalog_epub_mobi.py
@@ -498,12 +498,6 @@ class PluginWidget(QWidget,Ui_Form):
         elif self.merge_after.isChecked():
             checked = 'after'
         include_hr = self.include_hr.isChecked()
-        opts_dict['merge_comments_rule'] = "%s:%s:%s" % \
-            (self.merge_source_field_name, checked, include_hr)
-
-        opts_dict['header_note_source_field'] = self.header_note_source_field_name
-
-        opts_dict['genre_source_field'] = self.genre_source_field_name
 
         # Init self.merge_source_field_name
         self.merge_source_field_name = ''
@@ -526,6 +520,13 @@ class PluginWidget(QWidget,Ui_Form):
             genre_source_spec = self.genre_source_fields[cs]
             self.genre_source_field_name = genre_source_spec['field']
 
+        opts_dict['merge_comments_rule'] = "%s:%s:%s" % \
+            (self.merge_source_field_name, checked, include_hr)
+
+        opts_dict['header_note_source_field'] = self.header_note_source_field_name
+
+        opts_dict['genre_source_field'] = self.genre_source_field_name
+
         # Fix up exclude_genre regex if blank. Assume blank = no exclusions
         if opts_dict['exclude_genre'] == '':
             opts_dict['exclude_genre'] = 'a^'