From 418e068de3075224eb873d27a235b123bf024697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Thu, 12 Dec 2019 22:32:52 +0100 Subject: [PATCH] Terminal: fix TermView scripting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix #15532. Change-Id: I342d72c8de7a4e352329adb0510e3c7341702ef7 Reviewed-on: https://review.haiku-os.org/c/haiku/+/2016 Reviewed-by: Jérôme Duval --- src/apps/terminal/TermView.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/apps/terminal/TermView.cpp b/src/apps/terminal/TermView.cpp index 14c7758e80..fd604be7ae 100644 --- a/src/apps/terminal/TermView.cpp +++ b/src/apps/terminal/TermView.cpp @@ -1648,20 +1648,21 @@ TermView::MessageReceived(BMessage *msg) { int32 i; BMessage specifier; - if (msg->GetCurrentSpecifier(&i, &specifier) == B_OK - && strcmp("encoding", + if (msg->GetCurrentSpecifier(&i, &specifier) == B_OK) { + if (strcmp("encoding", specifier.FindString("property", i)) == 0) { - BMessage reply(B_REPLY); - reply.AddInt32("result", Encoding()); - msg->SendReply(&reply); - } else if (strcmp("tty", + BMessage reply(B_REPLY); + reply.AddInt32("result", Encoding()); + msg->SendReply(&reply); + } else if (strcmp("tty", specifier.FindString("property", i)) == 0) { - BMessage reply(B_REPLY); - reply.AddString("result", TerminalName()); - msg->SendReply(&reply); - } else { + BMessage reply(B_REPLY); + reply.AddString("result", TerminalName()); + msg->SendReply(&reply); + } else + BView::MessageReceived(msg); + } else BView::MessageReceived(msg); - } break; }