#1261 confine display chapter N to bibles; set option for it correctly.

Author: karlkleinpaste

src/gtk/menu_popup.c

@@ -1760,7 +1760,8 @@ G_MODULE_EXPORT void _add_and_check_global_opts(GladeXML *gxml,
 
 	item = UI_GET_ITEM(gxml, "chapter_N");
 
-	if (ops->display_chapter_N != -1) {
+	if ((main_get_mod_type(mod_name) == TEXT_TYPE) &&
+	    (ops->display_chapter_N != -1)) {
 		gtk_widget_show(item);
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item),
 					       ops->display_chapter_N);

src/main/global_ops.cc

@@ -237,6 +237,8 @@ GLOBAL_OPS *main_new_globals(const gchar *mod_name)
 	    (module_options[mod_name]["Cross-references"] != "Off");
 	ops->xrefnotenumbers =
 	    (module_options[mod_name]["XrefNoteNumbers"] != "Off");
+	ops->display_chapter_N =
+	    (module_options[mod_name]["Display Chapter N"] != "Off");
 
 	// more special case default on: heb/grk support.
 	ops->greekaccents =
@@ -273,11 +275,6 @@ GLOBAL_OPS *main_new_globals(const gchar *mod_name)
 		? -1 // "unknown"; otherwise, it's like the others.
 		: gui_of2tf(module_options[mod_name]["Respect Font Faces"].c_str());
 
-	ops->display_chapter_N =
-	    (*(module_options[mod_name]["Display Chapter N"].c_str()) == '\0')
-		? 1 // unspecified means "on"
-		: gui_of2tf(module_options[mod_name]["Display Chapter N"].c_str());
-
 	// special case, xiphos-specific feature: commentary whole chapter.
 	ops->commentary_by_chapter =
 	    ((backend->module_type(mod_name) == COMMENTARY_TYPE) &&