[haiku-commits] haiku: hrev43815 - src/kits/app
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 3 Mar 2012 20:13:49 +0100 (CET)
hrev43815 adds 1 changeset to branch 'master'
old head: 79a6d5e3f9512ef6c8a8b452346171ab9fc6c743
new head: 38d688ccbe075c8632c186909f76e03cad14bd7b
----------------------------------------------------------------------------
38d688c: BHandler: hopefully fixes a regression introduced in hrev43777.
* BHandler scripting handles bad scripting syntax by returning the Messenger
property.
* Thanks to Siarzhuk Zharski for pointing this out.
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev43815
Commit: 38d688ccbe075c8632c186909f76e03cad14bd7b
URL: http://cgit.haiku-os.org/haiku/commit/?id=38d688c
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Sat Mar 3 19:05:40 2012 UTC
----------------------------------------------------------------------------
1 files changed, 6 insertions(+), 3 deletions(-)
src/kits/app/Handler.cpp | 9 ++++++---
----------------------------------------------------------------------------
diff --git a/src/kits/app/Handler.cpp b/src/kits/app/Handler.cpp
index e200f97..f7fbb79 100644
--- a/src/kits/app/Handler.cpp
+++ b/src/kits/app/Handler.cpp
@@ -222,11 +222,14 @@ BHandler::MessageReceived(BMessage *message)
int32 form;
const char *prop;
- status_t err = message->GetCurrentSpecifier(&cur,
&specifier, &form, &prop);
- if (err != B_OK)
+ status_t err = message->GetCurrentSpecifier(&cur,
&specifier,
+ &form, &prop);
+ if (err != B_OK && err != B_BAD_SCRIPT_SYNTAX)
break;
bool known = false;
- if (cur < 0 || (strcmp(prop, "Messenger") == 0)) {
+ // B_BAD_SCRIPT_SYNTAX defaults to the Messenger
property
+ if (err == B_BAD_SCRIPT_SYNTAX || cur < 0
+ || (strcmp(prop, "Messenger") == 0)) {
err = reply.AddMessenger("result", this);
known = true;
} else if (strcmp(prop, "Suites") == 0) {
Other related posts:
- » [haiku-commits] haiku: hrev43815 - src/kits/app - korli
