better check for notify type

diff --git a/src/cache_maint.c b/src/cache_maint.c
index 5ab56fa..cf73d8a 100644 (file)
--- a/src/cache_maint.c
+++ b/src/cache_maint.c
@@ -627,7 +627,7 @@ static void cache_maint_copied(FileData *fd)
 
 void cache_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-       if (!fd->change) return;
+       if (type != NOTIFY_TYPE_CHANGE || !fd->change) return;
        
        switch(fd->change->type)
                {

diff --git a/src/collect-io.c b/src/collect-io.c
index 97a3df4..139d696 100644 (file)
--- a/src/collect-io.c
+++ b/src/collect-io.c
@@ -928,7 +928,7 @@ void collect_manager_flush(void)
 void collect_manager_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
 
-       if (!fd->change) return;
+       if (type != NOTIFY_TYPE_CHANGE || !fd->change) return;
        
        switch(fd->change->type)
                {

diff --git a/src/collect.c b/src/collect.c
index 089d715..b3ff6ac 100644 (file)
--- a/src/collect.c
+++ b/src/collect.c
@@ -766,7 +766,7 @@ static void collection_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
        CollectionData *cd = data;
 
-       if (!fd->change) return;
+       if (type != NOTIFY_TYPE_CHANGE || !fd->change) return;
        
        switch(fd->change->type)
                {

diff --git a/src/dupe.c b/src/dupe.c
index d25dee8..4396be3 100644 (file)
--- a/src/dupe.c
+++ b/src/dupe.c
@@ -3566,7 +3566,7 @@ static void dupe_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
        DupeWindow *dw = data;
 
-       if (!fd->change) return;
+       if (type != NOTIFY_TYPE_CHANGE || !fd->change) return;
        
        switch(fd->change->type)
                {

diff --git a/src/img-view.c b/src/img-view.c
index 7f3fded..5986d79 100644 (file)
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -1693,7 +1693,7 @@ static void view_window_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
        ViewWindow *vw = data;
 
-       if (!fd->change) return;
+       if (type != NOTIFY_TYPE_CHANGE || !fd->change) return;
        
        switch(fd->change->type)
                {

diff --git a/src/layout_image.c b/src/layout_image.c
index 3687300..65db270 100644 (file)
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -2093,7 +2093,7 @@ void layout_image_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
        LayoutWindow *lw = data;
 
-       if (!fd->change) return;
+       if (type != NOTIFY_TYPE_CHANGE || !fd->change) return;
        
        switch(fd->change->type)
                {

diff --git a/src/search.c b/src/search.c
index 96314e8..86a9e1c 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -2868,7 +2868,7 @@ static void search_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
        SearchData *sd = data;
 
-       if (!fd->change) return;
+       if (type != NOTIFY_TYPE_CHANGE || !fd->change) return;
        
        switch(fd->change->type)
                {

diff --git a/src/view_file_icon.c b/src/view_file_icon.c
index 4e6064e..2c0a64a 100644 (file)
--- a/src/view_file_icon.c
+++ b/src/view_file_icon.c
@@ -2559,7 +2559,7 @@ static void vficon_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
        ViewFile *vf = data;
 
-       if (!fd->change) return;
+       if (type != NOTIFY_TYPE_CHANGE || !fd->change) return;
        
        switch(fd->change->type)
                {

diff --git a/src/view_file_list.c b/src/view_file_list.c
index aff230e..dacf363 100644 (file)
--- a/src/view_file_list.c
+++ b/src/view_file_list.c
@@ -1909,18 +1909,21 @@ static void vflist_notify_cb(FileData *fd, NotifyType type, gpointer data)
                g_free(base);
                }
 
-       if (!refresh && fd->change && fd->change->dest)
+       if (type == NOTIFY_TYPE_CHANGE && fd->change)
                {
-               gchar *dest_base = remove_level_from_path(fd->change->dest);
-               refresh = (strcmp(dest_base, vf->dir_fd->path) == 0);
-               g_free(dest_base);
-               }
+               if (!refresh && fd->change->dest)
+                       {
+                       gchar *dest_base = remove_level_from_path(fd->change->dest);
+                       refresh = (strcmp(dest_base, vf->dir_fd->path) == 0);
+                       g_free(dest_base);
+                       }
 
-       if (!refresh && fd->change && fd->change->source)
-               {
-               gchar *source_base = remove_level_from_path(fd->change->source);
-               refresh = (strcmp(source_base, vf->dir_fd->path) == 0);
-               g_free(source_base);
+               if (!refresh && fd->change->source)
+                       {
+                       gchar *source_base = remove_level_from_path(fd->change->source);
+                       refresh = (strcmp(source_base, vf->dir_fd->path) == 0);
+                       g_free(source_base);
+                       }
                }
        
        if (refresh)