1 files changed, 22 insertions, 4 deletions

diff --git a/src/3rdParty/efsw/FileWatcherCWrapper.cpp b/src/3rdParty/efsw/FileWatcherCWrapper.cpp
index 5c49a66..8712d6e 100755..100644
--- a/src/3rdParty/efsw/FileWatcherCWrapper.cpp
+++ b/src/3rdParty/efsw/FileWatcherCWrapper.cpp
@@ -28,12 +28,12 @@ class Watcher_CAPI : public efsw::FileWatchListener {
  */
 static std::vector<Watcher_CAPI*> g_callbacks;
 
-Watcher_CAPI* find_callback( efsw_watcher watcher, efsw_pfn_fileaction_callback fn ) {
+Watcher_CAPI* find_callback( efsw_watcher watcher, efsw_pfn_fileaction_callback fn, void* param ) {
         for ( std::vector<Watcher_CAPI*>::iterator i = g_callbacks.begin(); i != g_callbacks.end();
                   ++i ) {
                 Watcher_CAPI* callback = *i;
 
-                if ( callback->mFn == fn && callback->mWatcher == watcher )
+                if ( callback->mFn == fn && callback->mWatcher == watcher && callback->mParam == param )
                         return *i;
         }
 
@@ -71,17 +71,35 @@ const char* efsw_getlasterror() {
         return log_str.c_str();
 }
 
+EFSW_API void efsw_clearlasterror() {
+        efsw::Errors::Log::clearLastError();
+}
+
 efsw_watchid efsw_addwatch( efsw_watcher watcher, const char* directory,
                                                         efsw_pfn_fileaction_callback callback_fn, int recursive, void* param ) {
-        Watcher_CAPI* callback = find_callback( watcher, callback_fn );
+        return efsw_addwatch_withoptions( watcher, directory, callback_fn, recursive, 0, 0, param );
+}
+
+efsw_watchid  efsw_addwatch_withoptions(efsw_watcher watcher, const char* directory,
+                                                                                efsw_pfn_fileaction_callback callback_fn, int recursive,
+                                                                                efsw_watcher_option *options, int options_number,
+                                                                                void* param) {
+        Watcher_CAPI* callback = find_callback( watcher, callback_fn, param );
 
         if ( callback == NULL ) {
                 callback = new Watcher_CAPI( watcher, callback_fn, param );
                 g_callbacks.push_back( callback );
         }
 
+        std::vector<efsw::WatcherOption> watcher_options{};
+        for ( int i = 0; i < options_number; i++ ) {
+                efsw_watcher_option* option = &options[i];
+                watcher_options.emplace_back( efsw::WatcherOption{
+                        static_cast<efsw::Option>(option->option), option->value } );
+        }
+
         return ( (efsw::FileWatcher*)watcher )
-                ->addWatch( std::string( directory ), callback, TOBOOL( recursive ) );
+                ->addWatch( std::string( directory ), callback, TOBOOL( recursive ), watcher_options );
 }
 
 void efsw_removewatch( efsw_watcher watcher, const char* directory ) {