From dc108b6705cee7c0e90bf3955ea250ced30a0b02 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Sat, 10 Feb 2018 01:45:42 +0000
Subject: [PATCH] New font mode doesn't need the telnet binary option either.

---
 exec/load/cterm_lib.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/exec/load/cterm_lib.js b/exec/load/cterm_lib.js
index 9534e5179c..4320094bfd 100644
--- a/exec/load/cterm_lib.js
+++ b/exec/load/cterm_lib.js
@@ -261,9 +261,11 @@ function load_font(slot, data, force)
 	}
 	log(LOG_DEBUG, format("CTerm load_font: slot %u with %u bytes", slot, data.length));
 	load('sbbsdefs.js');
-	if(!(console.telnet_mode&TELNET_MODE_OFF)) {
-		if(!console.telnet_cmd(TELNET_WILL, TELNET_BINARY_TX, 1000))
-			mswait(100);	// Insure we enter binary mode *before* sending font data
+	if (cterm_version < cterm_version_supports_b64_fonts) {
+		if(!(console.telnet_mode&TELNET_MODE_OFF)) {
+			if(!console.telnet_cmd(TELNET_WILL, TELNET_BINARY_TX, 1000))
+				mswait(100);	// Insure we enter binary mode *before* sending font data
+		}
 	}
 	var fsize = fontsize(data.length);
 	if(fsize < 0) {
@@ -279,8 +281,10 @@ function load_font(slot, data, force)
 	}
 	if(fsize == 1 && console.cterm_version < 1168)
 		console.write("\x00\x00");	// Work-around cterm bug for 8x14 fonts
-	if(!(console.telnet_mode&TELNET_MODE_OFF))
-		console.telnet_cmd(TELNET_WONT, TELNET_BINARY_TX);
+	if (cterm_version < cterm_version_supports_b64_fonts) {
+		if(!(console.telnet_mode&TELNET_MODE_OFF))
+			console.telnet_cmd(TELNET_WONT, TELNET_BINARY_TX);
+	}
 	console.cterm_fonts_loaded[slot] = true;
 	return true;
 }
-- 
GitLab