Format and reversion code for new counter inset.

[lyx.git] / src / support / AppleScript.m

diff --git a/src/support/AppleScript.m b/src/support/AppleScript.m
index bf06b02d426f0f15d5407d3ec3396d63bb6c326a..b38f94abfdfd5b8565f853c3732cff86062d9036 100644 (file)
--- a/src/support/AppleScript.m
+++ b/src/support/AppleScript.m
@@ -7,7 +7,7 @@
  *
  * Full author contact details are available in file CREDITS.
  */
- 
+
 #import <Cocoa/Cocoa.h>
 #include "AppleScript.h"
 
@@ -26,16 +26,22 @@
   NSString * directParameter = [self directParameter];
   NSString *arg = [theArguments objectForKey: @"arg"];
 
-    
+
   // Execute the command
   LyXFunctionResult result = applescript_execute_command([directParameter UTF8String], [arg UTF8String]);
-  
+
   // Construct the result record
   NSString *message = [NSString stringWithCString:result.message encoding:NSUTF8StringEncoding];
-  free(result.message); 
-  
-  NSDictionary *objcResult = [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithInt:result.code], @"code", message, @"message", nil];
-  return objcResult;
+  free(result.message);
+
+  if (result.code != 0) {
+    NSScriptCommand* c = [NSScriptCommand currentCommand];
+    [c setScriptErrorNumber:result.code];
+    [c setScriptErrorString:message];
+    return NULL;
+  }
+
+  return message;
 }
 
 @end