Merge lp:~jeremywootten/pantheon-files/fix-1465155-crash-on-toggle-hiddens-in-list-view into lp:~elementary-apps/pantheon-files/trunk

Proposed by Jeremy Wootten
Status: Merged
Approved by: Cody Garver
Approved revision: 1856
Merged at revision: 1873
Proposed branch: lp:~jeremywootten/pantheon-files/fix-1465155-crash-on-toggle-hiddens-in-list-view
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 21 lines (+1/-4)
1 file modified
src/View/AbstractDirectoryView.vala (+1/-4)
To merge this branch: bzr merge lp:~jeremywootten/pantheon-files/fix-1465155-crash-on-toggle-hiddens-in-list-view
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+261936@code.launchpad.net

Commit message

Remove subdirectories, not reload them, when toggling show-hidden-files in List view (lp:1465155)

Description of the change

Fixes crash caused by attempting to reload subdirectories after model was cleared when toggling show-hidden-files. Also empties loaded subdirectory list before toggling to prevent reference leak.

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 'src/View/AbstractDirectoryView.vala'
2--- src/View/AbstractDirectoryView.vala 2015-06-06 08:41:29 +0000
3+++ src/View/AbstractDirectoryView.vala 2015-06-15 08:45:30 +0000
4@@ -1221,16 +1221,13 @@
5 /** Handle Preference changes */
6 private void on_show_hidden_files_changed (GLib.Object prefs, GLib.ParamSpec pspec) {
7 bool show = (prefs as GOF.Preferences).show_hidden_files;
8+ cancel ();
9 if (!show) {
10 block_model ();
11 model.clear ();
12 }
13
14 directory_hidden_changed (slot.directory, show);
15- if (loaded_subdirectories != null)
16- loaded_subdirectories.@foreach ((dir) => {
17- directory_hidden_changed (dir, show);
18- });
19
20 if (!show)
21 unblock_model ();

Subscribers

People subscribed via source and target branches

to all changes: