From 6825eeb17901d321a1fd1d527611c97c4ec43b3b Mon Sep 17 00:00:00 2001
From: Merlijn Wajer <merlijn@wajer.org>
Date: Tue, 1 Jun 2010 02:03:25 +0200
Subject: [PATCH] Fix

---
 Projects/MMLLib/libmml.lpr        | 11 +++++++++--
 Projects/MMLLib/pymml/mmlcolor.py |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Projects/MMLLib/libmml.lpr b/Projects/MMLLib/libmml.lpr
index 55ad1ac..e16935f 100644
--- a/Projects/MMLLib/libmml.lpr
+++ b/Projects/MMLLib/libmml.lpr
@@ -102,9 +102,16 @@ begin
 end;
 
 
-function findColor(var x, y: integer; color, x1, y1, x2, y2: integer): boolean;
+function findColor(var x, y: integer; color, x1, y1, x2, y2: integer): integer;
 begin
-  C.MFinder.FindColor(x, y, color, x1, y1, x2, y2);
+  try
+    C.MFinder.FindColor(x, y, color, x1, y1, x2, y2);
+  except on e : Exception do
+  begin
+    result := RESULT_ERROR;
+    last_error := PChar(e.Message);
+  end;
+  end;
 end;
 
 function returnpoints: PTPoint;  cdecl;
diff --git a/Projects/MMLLib/pymml/mmlcolor.py b/Projects/MMLLib/pymml/mmlcolor.py
index cd6f7e8..a5e1abf 100644
--- a/Projects/MMLLib/pymml/mmlcolor.py
+++ b/Projects/MMLLib/pymml/mmlcolor.py
@@ -25,6 +25,6 @@ class Color(object):
         return (x, y)
 
     def _initialiseDLLFuncs(self):
-        self._mc.dll.findColor.restype = c_bool
+        self._mc.dll.findColor.restype = c_int
         self._mc.dll.findColor.argtypes = [PINTEGER, PINTEGER, c_int, c_int,
                 c_int, c_int, c_int]