Correct lookup of Explorer-specific file association information.

[wxWidgets.git] / src / unix / fswatcher_inotify.cpp

diff --git a/src/unix/fswatcher_inotify.cpp b/src/unix/fswatcher_inotify.cpp
index f23f4439e3686dbb8c23207c3ebb09e4bbf8e87a..4801a2f70877007baa6b1245248b2b95ccd99f04 100644 (file)
--- a/src/unix/fswatcher_inotify.cpp
+++ b/src/unix/fswatcher_inotify.cpp
@@ -250,11 +250,26 @@ protected:
                 }
                 else
                 {
                 }
                 else
                 {

-                    wxFAIL_MSG("Event for unknown watch descriptor.");
+                    // In theory we shouldn't reach here. In practice, some
+                    // events, e.g. IN_MODIFY, arrive just after the IN_IGNORED
+                    // so their wd has already been discarded. Warn about them.
+                    wxFileSystemWatcherEvent
+                        event
+                        (
+                            wxFSW_EVENT_WARNING,
+                            wxString::Format
+                            (
+                             _("Unexpected event for \"%s\": no "
+                               "matching watch descriptor."),
+                             inevt.len ? inevt.name : ""
+                            )
+                        );
+                    SendEvent(event);
+

                 }
 
                 // In any case, don't process this event: it's either for an
                 }
 
                 // In any case, don't process this event: it's either for an

-                // already removed entry, or for a completely unknown one.
+                // already removed entry, or for an unknown one.

                 return;
             }
         }
                 return;
             }
         }