diff options
| author |  keis <keijser@gmail.com> | 2011-01-05 00:18:58 +0100 |
|---|---|---|
| committer | keis <keijser@gmail.com> | 2011-01-05 00:39:42 +0100 |
| commit | 597c1051c36a51bc730c9684a1a7a6d9535001cb (patch) | |
| tree | 0bbbdb6c4362bdfd84651a97059b33288cc27652 /src | |
| parent | cdcce86bb76f9f32ff01bd00d1799a6874b30c65 (diff) | |
clear GError before reusing
Diffstat (limited to 'src')
| -rw-r--r-- | src/uzbl-core.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/uzbl-core.c b/src/uzbl-core.c index 592a8dd..c5e9832 100644 --- a/src/uzbl-core.c +++ b/src/uzbl-core.c @@ -1771,13 +1771,16 @@ control_client_socket(GIOChannel *clientchan) { ret = g_io_channel_read_line(clientchan, &ctl_line, &len, NULL, &error); if (ret == G_IO_STATUS_ERROR) { g_warning ("Error reading: %s\n", error->message); + g_clear_error (&error); remove_socket_from_array(clientchan); g_io_channel_shutdown(clientchan, TRUE, &error); + g_clear_error (&error); return FALSE; } else if (ret == G_IO_STATUS_EOF) { remove_socket_from_array(clientchan); /* shutdown and remove channel watch from main loop */ g_io_channel_shutdown(clientchan, TRUE, &error); + g_clear_error (&error); return FALSE; } @@ -1788,11 +1791,12 @@ control_client_socket(GIOChannel *clientchan) { &len, &error); if (ret == G_IO_STATUS_ERROR) { g_warning ("Error writing: %s", error->message); + g_clear_error (&error); } g_io_channel_flush(clientchan, &error); + g_clear_error (&error); } - if (error) g_error_free (error); g_string_free(result, TRUE); g_free(ctl_line); return TRUE; |