From: Enrico Forestieri <forenr@lyx.org>
Date: Sat, 23 Sep 2023 14:18:28 +0000 (+0200)
Subject: Amend 12e3d46b
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ddf81b4e190deaf40fef2ab44fdbe1cbff63597a;p=features.git

Amend 12e3d46b

Also account for alerts regarding documents that are explicitly
allowed to execute external commands through the settings.
---

diff --git a/src/Converter.cpp b/src/Converter.cpp
index f9e627bf86..881aac6bd3 100644
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -336,21 +336,23 @@ bool Converters::checkAuth(Converter const & conv, string const & doc_fname,
 		? (has_token ? conv_command.insert(token_pos, "-shell-escape ")
 			     : conv_command.append(" -shell-escape"))
 		: conv_command;
+	// Only change font if gui is available otherwise Qt6 crashes
+	string const cmd = use_gui ? "<tt>" + command + "</tt>" : command;
 	docstring const security_warning = (use_shell_escape
 	    ? bformat(_("<p>The following LaTeX backend has been requested "
 	        "to allow execution of external programs:</p>"
-	        "<center><p><tt>%1$s</tt></p></center>"
+	        "<center><p>%1$s</p></center>"
 	        "<p>The external programs can execute arbitrary commands on "
 	        "your system, including dangerous ones, if instructed to do "
 	        "so by a maliciously crafted LyX document.</p>"),
-	      from_utf8(command))
+	      from_utf8(cmd))
 	    : bformat(_("<p>The requested operation requires the use of a "
 	        "converter from %2$s to %3$s:</p>"
-	        "<blockquote><p><tt>%1$s</tt></p></blockquote>"
+	        "<blockquote><p>%1$s</p></blockquote>"
 	        "<p>This external program can execute arbitrary commands on "
 	        "your system, including dangerous ones, if instructed to do "
 	        "so by a maliciously crafted LyX document.</p>"),
-	      from_utf8(command), from_utf8(conv.from()),
+	      from_utf8(cmd), from_utf8(conv.from()),
 	      from_utf8(conv.to())));
 	if (lyxrc.use_converter_needauth_forbidden && !use_shell_escape) {
 		frontend::Alert::error(