diff options
| author | Robert Swain <robert.swain@collabora.co.uk> | 2011-03-31 20:13:57 +0200 |
|---|---|---|
| committer | Robert Swain <robert.swain@collabora.co.uk> | 2011-03-31 20:13:57 +0200 |
| commit | 4285813e01e1f575f8070a11546fe54dfa9a758e (patch) | |
| tree | dc8c28258983dd6587ae65e5879895ca2a8905a5 | |
| parent | 02b89c505b29b068460d657fbece900301707bd4 (diff) | |
UI: Only free errors if they exist
| -rw-r--r-- | src/user_interface.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/user_interface.c b/src/user_interface.c index 4b956eb..4359108 100644 --- a/src/user_interface.c +++ b/src/user_interface.c @@ -324,8 +324,10 @@ load_controls (UserInterface * ui) ui->control_bg = clutter_texture_new_from_file (vid_panel_png, &error); if (!ui->control_bg && error) g_debug ("Clutter error: %s\n", error->message); - g_error_free (error); - error = NULL; + if (error) { + g_error_free (error); + error = NULL; + } g_free (vid_panel_png); clutter_container_add_actor (CLUTTER_CONTAINER (ui->control_box), @@ -341,8 +343,10 @@ load_controls (UserInterface * ui) ui->control_play_toggle = clutter_texture_new_from_file (ui->pause_png, &error); if (!ui->control_play_toggle && error) g_debug ("Clutter error: %s\n", error->message); - g_error_free (error); - error = NULL; + if (error) { + g_error_free (error); + error = NULL; + } clutter_box_layout_pack (CLUTTER_BOX_LAYOUT (main_box_layout), ui->control_play_toggle, FALSE, /* expand */ |