Merge lp:~jonas-drange/ubuntu-settings-components/fix-freeing-of-jobs into lp:~phablet-team/ubuntu-settings-components/printer-components

Proposed by Jonas G. Drange
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 231
Merged at revision: 231
Proposed branch: lp:~jonas-drange/ubuntu-settings-components/fix-freeing-of-jobs
Merge into: lp:~phablet-team/ubuntu-settings-components/printer-components
Diff against target: 15 lines (+2/-1)
1 file modified
plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp (+2/-1)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-settings-components/fix-freeing-of-jobs
Reviewer Review Type Date Requested Status
Andrew Hayzen (community) Approve
Review via email: mp+317632@code.launchpad.net

Commit message

frees all the jobs which works fine

To post a comment you must log in.
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

LGTM, this fixes the issue of having the app crashing on startup when jobs already exist in the queue.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp'
2--- plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp 2017-02-17 13:06:59 +0000
3+++ plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp 2017-02-17 14:28:19 +0000
4@@ -575,9 +575,10 @@
5 newJob->setTitle(QString::fromLocal8Bit(job->title));
6 newJob->setUser(QString::fromLocal8Bit(job->user));
7
8- cupsFreeJobs(1, job);
9 list.append(newJob);
10 }
11+ if (!list.isEmpty())
12+ cupsFreeJobs(list.size(), jobs.first());
13
14 return list;
15 }

Subscribers

People subscribed via source and target branches