print-operation: Be more robust in the error path

This isn't an issue at the moment. Only exporting to a file can fail
by setting by setting an error and it happens to correctly return
GTK_PRINT_OPERATION_RESULT_ERROR regardless of this code.

Still, let's make this block of code more correct to prevent future
changes from introducing broken behaviour.

https://bugzilla.gnome.org/show_bug.cgi?id=763731
This commit is contained in:
Debarshi Ray 2016-03-16 02:18:24 +01:00
parent f988f1131b
commit 2407f157c7

View File

@ -3283,9 +3283,10 @@ gtk_print_operation_run (GtkPrintOperation *op,
if (run_print_pages)
print_pages (op, parent, do_print, result);
if (priv->error && error)
if (priv->error)
{
*error = g_error_copy (priv->error);
if (error)
*error = g_error_copy (priv->error);
result = GTK_PRINT_OPERATION_RESULT_ERROR;
}
else if (priv->cancelled)