← Back to branch summary

~jeremywootten/pantheon-files/fix-backspace-in-columnv-view

« back to all changes in this revision

Viewing changes to libwidgets/View/BreadcrumbsEntry.vala

  • Committer: Jeremy Wootten
  • Date: 2016-01-29 17:21:40 UTC
  • mfrom: (2023.1.25 pantheon-files)
  • Revision ID: jeremy@elementaryos.org-20160129172140-hirnjv1uo5mxiz7b
merge trunk r2048

Show diffs side-by-side

added added

removed removed

Lines of Context:
libwidgets/View/BreadcrumbsEntry.vala
151
151
 
152
152
            if (current_completion_dir == null || !file.equal (current_completion_dir.location)) {
153
153
                current_completion_dir = GOF.Directory.Async.from_gfile (file);
154
 
            }
 
154
                current_completion_dir.init (on_file_loaded);
 
155
            } else {
155
156
 
156
 
            if (current_completion_dir != null  && current_completion_dir.can_load) {
157
 
                clear_completion ();
158
 
                /* Completion text set by on_file_loaded () */
159
 
                current_completion_dir.load (on_file_loaded);
 
157
                if (current_completion_dir != null  && current_completion_dir.can_load) {
 
158
                    clear_completion ();
 
159
                    /* Completion text set by on_file_loaded () */
 
160
                    current_completion_dir.init (on_file_loaded);
 
161
                }
160
162
            }
161
163
        }
162
164
 
387
389
                    append_subdirectories (menu, files_menu_dir);
388
390
                    files_menu_dir.disconnect (files_menu_dir_handler_id);
389
391
                });
390
 
                files_menu_dir.load ();
 
392
                files_menu_dir.init ();
391
393
            } else {
392
394
                warning ("Root directory null for %s", path);
393
395
            }