Merge lp:~lathiat/unity-control-center/lp1304388 into lp:unity-control-center

Proposed by Trent Lloyd on 2016-06-12
Status: Merged
Approved by: Sebastien Bacher on 2016-06-17
Approved revision: 12867
Merged at revision: 12867
Proposed branch: lp:~lathiat/unity-control-center/lp1304388
Merge into: lp:unity-control-center
Diff against target: 12 lines (+1/-1)
1 file modified
panels/info/cc-info-panel.c (+1/-1)
To merge this branch: bzr merge lp:~lathiat/unity-control-center/lp1304388
Reviewer Review Type Date Requested Status
Sebastien Bacher 2016-06-12 Approve on 2016-06-17
Review via email: mp+297137@code.launchpad.net

This proposal supersedes a proposal from 2016-06-12.

Commit message

This patch fixes a crash when changing the default browser handler

Description of the change

This patch from upstream fixes a crash when changing the default browser handler (Bug #1304388)

This should be imported to both 14.04 and 16.04

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panels/info/cc-info-panel.c'
2--- panels/info/cc-info-panel.c 2016-03-09 22:06:07 +0000
3+++ panels/info/cc-info-panel.c 2016-06-12 12:52:26 +0000
4@@ -813,7 +813,7 @@
5 pattern = g_pattern_spec_new (app_data->extra_type_filter);
6 mime_types = g_app_info_get_supported_types (info);
7
8- for (i = 0; mime_types[i]; i++)
9+ for (i = 0; mime_types && mime_types[i]; i++)
10 {
11 if (!g_pattern_match_string (pattern, mime_types[i]))
12 continue;

Subscribers

People subscribed via source and target branches