From cac6fc5626c831f6210b2ab2b9a4eb9667c73d0d Mon Sep 17 00:00:00 2001
From: Sergios - Anestis Kefalidis <sergioskefalidis@gmail.com>
Date: Fri, 2 Apr 2021 00:48:55 +0300
Subject: [PATCH] Fix style and uninitialized renamer_dialog->mode_combo
MR !87
---
thunar/thunar-renamer-dialog.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/thunar/thunar-renamer-dialog.c b/thunar/thunar-renamer-dialog.c
index 1c7266579..142d589ff 100644
--- a/thunar/thunar-renamer-dialog.c
+++ b/thunar/thunar-renamer-dialog.c
@@ -484,6 +484,8 @@ thunar_renamer_dialog_init (ThunarRenamerDialog *renamer_dialog)
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
+ renamer_dialog->mode_combo = NULL;
+
/* check if we have any renamers */
if (G_LIKELY (renamers != NULL))
{
@@ -1838,6 +1840,7 @@ thunar_show_renamer_dialog (gpointer parent,
GdkScreen *screen;
GtkWidget *dialog;
GtkWidget *window = NULL;
+ GtkComboBox *mode_combo;
GList *lp;
gboolean directories_only;
@@ -1890,8 +1893,9 @@ thunar_show_renamer_dialog (gpointer parent,
if (thunar_file_is_directory (THUNAR_FILE (lp->data)) == FALSE)
directories_only = FALSE;
- if (directories_only)
- gtk_combo_box_set_active (GTK_COMBO_BOX (THUNAR_RENAMER_DIALOG (dialog)->mode_combo), THUNAR_RENAMER_MODE_BOTH);
+ mode_combo = GTK_COMBO_BOX (THUNAR_RENAMER_DIALOG (dialog)->mode_combo);
+ if (directories_only && mode_combo != NULL)
+ gtk_combo_box_set_active (mode_combo, THUNAR_RENAMER_MODE_BOTH);
/* let the application handle the dialog */
application = thunar_application_get ();
--
GitLab