X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=mono%2Fmetadata%2Ffilewatcher.c;h=159a2537bcbf05459238ba5491a5a46be6816946;hb=HEAD;hp=e6902c6caa394157f7ec2c223980bc84f42df8cd;hpb=b2cf10659d74681988ad53c18f368c007990d829;p=mono.git

diff --git a/mono/metadata/filewatcher.c b/mono/metadata/filewatcher.c
index e6902c6caa3..159a2537bcb 100644
--- a/mono/metadata/filewatcher.c
+++ b/mono/metadata/filewatcher.c
@@ -1,5 +1,6 @@
-/*
- * filewatcher.c: File System Watcher internal calls
+/**
+ * \file
+ * File System Watcher internal calls
  *
  * Authors:
  *	Gonzalo Paniagua Javier (gonzalo@ximian.com)
@@ -28,6 +29,8 @@
 #include <mono/metadata/marshal.h>
 #include <mono/utils/mono-dl.h>
 #include <mono/utils/mono-io-portability.h>
+#include <mono/metadata/w32error.h>
+
 #ifdef HOST_WIN32
 
 /*
@@ -108,12 +111,15 @@ ves_icall_System_IO_FAMW_InternalFAMNextEvent (gpointer conn,
 					       gint *code,
 					       gint *reqnum)
 {
+	MonoError error;
 	FAMEvent ev;
 
 	if (FAMNextEvent (conn, &ev) == 1) {
-		*filename = mono_string_new (mono_domain_get (), ev.filename);
+		*filename = mono_string_new_checked (mono_domain_get (), ev.filename, &error);
 		*code = ev.code;
 		*reqnum = ev.fr.reqnum;
+		if (mono_error_set_pending_exception (&error))
+			return FALSE;
 		return TRUE;
 	}