Ticket #1687: hotloading.patch

source/ps/Filesystem.cpp

@@ -73 +73 @@
 
     std::vector<DirWatchNotification> notifications;
     RETURN_STATUS_IF_ERR(dir_watch_Poll(notifications));
+    Status status = INFO::OK;
     for(size_t i = 0; i < notifications.size(); i++)
     {
         if(!CanIgnore(notifications[i]))
         {
+            // TODO: logging?
+            #define CONTINUE_IF_ERR(expression)\
+                status = (expression);\
+                if (status < 0)\
+                    continue
+
             VfsPath pathname;
-            RETURN_STATUS_IF_ERR(g_VFS->GetVirtualPath(notifications[i].Pathname(), pathname));
-            RETURN_STATUS_IF_ERR(g_VFS->RemoveFile(pathname));
-            RETURN_STATUS_IF_ERR(g_VFS->RepopulateDirectory(pathname.Parent()/""));
+            CONTINUE_IF_ERR(g_VFS->GetVirtualPath(notifications[i].Pathname(), pathname));
+            // Handle additions of new files too
+            status = g_VFS->RemoveFile(pathname);
+            if (status < 0 && status != ERR::VFS_FILE_NOT_FOUND)
+                continue;
+
+            CONTINUE_IF_ERR(g_VFS->RepopulateDirectory(pathname.Parent()/""));
 
             // Tell each hotloadable system about this file change:
 
-            RETURN_STATUS_IF_ERR(g_GUI->ReloadChangedFiles(pathname));
+            g_GUI->ReloadChangedFiles(pathname);
 
             for (size_t j = 0; j < g_ReloadFuncs.size(); ++j)
                 g_ReloadFuncs[j].first(g_ReloadFuncs[j].second, pathname);
 
-            RETURN_STATUS_IF_ERR(h_reload(g_VFS, pathname));
+            h_reload(g_VFS, pathname);
+
+            #undef CONTINUE_IF_ERR
         }
     }
     return INFO::OK;