[dualscreen] fix crash on ctrl+w and fix control window closing

[evince.git] / libview / ev-jobs.c

diff --git a/libview/ev-jobs.c b/libview/ev-jobs.c
index ee58943e1bc2c637c4d0d3320dec2bb974d0b4ba..816a56bbb3c7987351291af6d82f778eb0c41243 100644 (file)
--- a/libview/ev-jobs.c
+++ b/libview/ev-jobs.c
@@ -216,7 +216,7 @@ ev_job_run (EvJob *job)
 void
 ev_job_cancel (EvJob *job)
 {
-       if (job->cancelled || (job->finished && job->idle_finished_id == 0))
+       if (job->cancelled)
                return;
 
        ev_debug_message (DEBUG_JOBS, "job %s (%p) cancelled", EV_GET_TYPE_NAME (job), job);
@@ -225,6 +225,10 @@ ev_job_cancel (EvJob *job)
        /* This should never be called from a thread */
        job->cancelled = TRUE;
        g_cancellable_cancel (job->cancellable);
+
+        if (job->finished && job->idle_finished_id == 0)
+                return;
+
        g_signal_emit (job, job_signals[CANCELLED], 0);
 }
 
@@ -1556,6 +1560,9 @@ ev_job_print_run (EvJob *job)
 
        ev_document_doc_mutex_unlock ();
 
+        if (g_cancellable_is_cancelled (job->cancellable))
+                return FALSE;
+
        cr_status = cairo_status (job_print->cr);
        if (cr_status == CAIRO_STATUS_SUCCESS) {
                ev_job_succeeded (job);