Merge pull request geany#3640 from eht16/issue3624_do_not_none_charset

Do not show charset "None" in the list of encodings
peter-scholtens · Dec 9, 2023 · 512e88d · 512e88d
2 parents ffaa383 + 17523e5
commit 512e88d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/encodings.c b/src/encodings.c
@@ -278,7 +278,10 @@ gchar *encodings_to_string(const GeanyEncoding* enc)
 	g_return_val_if_fail(enc->name != NULL, NULL);
 	g_return_val_if_fail(enc->charset != NULL, NULL);
 
-	return g_strdup_printf("%s (%s)", enc->name, enc->charset);
+	if (enc->idx == GEANY_ENCODING_NONE)
+		return g_strdup(enc->name); // enc->charset is "None" and would be useless to display
+	else
+		return g_strdup_printf("%s (%s)", enc->name, enc->charset);
 }