[nautilus] batch-rename-dialog: clear some task data unconditionally



commit e1c4119457af8e5a5db085024cf49439726589e0
Author: Ernestas Kulik <ernestask src gnome org>
Date:   Thu Sep 8 20:13:44 2016 +0300

    batch-rename-dialog: clear some task data unconditionally
    
    destroy_conflicts_task_data() erroneously checks pointers to the mutex
    and condition variables. They always evaluate to true and thus no
    checking should be done in that case.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=771071

 src/nautilus-batch-rename-dialog.c |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/src/nautilus-batch-rename-dialog.c b/src/nautilus-batch-rename-dialog.c
index 0af08a7..902879d 100644
--- a/src/nautilus-batch-rename-dialog.c
+++ b/src/nautilus-batch-rename-dialog.c
@@ -1664,15 +1664,8 @@ destroy_conflicts_task_data (gpointer data)
         g_list_free (task_data->directories);
     }
 
-    if (&task_data->wait_ready_mutex)
-    {
-        g_mutex_clear (&task_data->wait_ready_mutex);
-    }
-
-    if (&task_data->wait_ready_condition)
-    {
-        g_cond_clear (&task_data->wait_ready_condition);
-    }
+    g_mutex_clear (&task_data->wait_ready_mutex);
+    g_cond_clear (&task_data->wait_ready_condition);
 }
 
 static void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]