From 2d051c51b6b1613b8bf5e1e87f5d0a632e358531 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Tue, 4 Jun 2019 09:02:10 +0000
Subject: [PATCH] Change name of key from "sub_default" to "msg_default" (it's
 the default avatar for all message areas not otherwise given a default
 value).

---
 exec/avatars.js       | 8 +++++---
 exec/showmsgavatar.js | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/exec/avatars.js b/exec/avatars.js
index 2d126e37e0..0d43f417df 100644
--- a/exec/avatars.js
+++ b/exec/avatars.js
@@ -598,7 +598,8 @@ function main()
 			case "normalize":
 			case "count":
 			case "colls":
-			case "sub_default":
+			case "msg-default":
+			case "msg_default":
 				cmds.push(arg);
 				break;
 			default:
@@ -773,7 +774,8 @@ function main()
 				printf("%s\r\n", success ? "Successful" : "FAILED!");
 				ini.close();
 				break;
-			case "sub_default":
+			case "msg-default":
+			case "msg_default":
 				if(!files.length)
 					files.push(optval[cmd]);
 				if(!files.length) {
@@ -795,7 +797,7 @@ function main()
 					alert(ini.name + " open error " + ini.error);
 					break;
 				}
-				var success = ini.iniSetValue("avatars", "sub_default", data);
+				var success = ini.iniSetValue("avatars", "msg_default", data);
 				printf("%s\r\n", success ? "Successful" : "FAILED!");
 				ini.close();
 				break;
diff --git a/exec/showmsgavatar.js b/exec/showmsgavatar.js
index 0212b368c9..eb514a6c8b 100644
--- a/exec/showmsgavatar.js
+++ b/exec/showmsgavatar.js
@@ -26,7 +26,7 @@ function draw_default_avatar(sub)
 	if(!avatar)
 		avatar = options[msg_area.sub[sub].grp_name.toLowerCase() + "_default"];
 	if(!avatar)
-		avatar = options.sub_default;
+		avatar = options.msg_default;
 	if(avatar)
 		Avatar.draw_bin(avatar, /* above: */true, /* right-justified: */true, bbs.msghdr_top_of_screen);
 }
-- 
GitLab