2 files changed, 7 insertions, 3 deletions
diff --git a/src/gsm_color_button.c b/src/gsm_color_button.c
index ce72cc1..da82169 100644
--- a/src/gsm_color_button.c
+++ b/src/gsm_color_button.c
@@ -601,8 +601,6 @@ gsm_color_button_init (GSMColorButton * color_button)
 {
 color_button->priv = GSM_COLOR_BUTTON_GET_PRIVATE (color_button);
 
- rsvg_init ();
-
 color_button->priv->color.red = 0;
 color_button->priv->color.green = 0;
 color_button->priv->color.blue = 0;
@@ -651,7 +649,6 @@ gsm_color_button_finalize (GObject * object)
 cairo_surface_destroy (color_button->priv->image_buffer);
 color_button->priv->image_buffer = NULL;
 
- rsvg_term ();
 G_OBJECT_CLASS (gsm_color_button_parent_class)->finalize (object);
 }
 
diff --git a/src/procman.cpp b/src/procman.cpp
index 16640c3..9a4d543 100644
--- a/src/procman.cpp
+++ b/src/procman.cpp
@@ -728,6 +728,9 @@ main (int argc, char *argv[])
 exit (0);
 }
 
+ /* initialize rsvg */
+ rsvg_init ();
+
 gtk_window_set_default_icon_name ("utilities-system-monitor");
 g_set_application_name(_("System Monitor"));
 
@@ -768,6 +771,10 @@ main (int argc, char *argv[])
 
 glibtop_close ();
 
+ // This function should only be called just before program exit.
+ // See MATE bug #592100 for a discussion about this.
+ rsvg_term ();
+
 return 0;
 }