← Back to branch summary

~jeremywootten/pantheon-files/fix-1604300-merge-find-functionalities-part1

« back to all changes in this revision

Viewing changes to src/View/ViewContainer.vala

  • Committer: Jeremy Wootten
  • Date: 2017-01-13 13:31:06 UTC
  • mfrom: (2412.1.32 pantheon-files)
  • Revision ID: jeremy@elementaryos.org-20170113133106-v9l164ms13lh3p0a
Merge trunk to r2444 and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/View/ViewContainer.vala
126
126
        
127
127
        private void on_folder_deleted (GLib.File deleted) {
128
128
            if (deleted.equal (this.location)) {
129
 
                close ();
130
 
                window.remove_tab (this);
 
129
                if (!go_up ()) {
 
130
                    close ();
 
131
                    window.remove_tab (this);
 
132
                }
131
133
            }
132
134
        }
133
135
 
163
165
            }
164
166
        }
165
167
 
166
 
        public void go_up () {
 
168
        public bool go_up () {
167
169
            selected_locations.append (this.location);
168
170
            GLib.File parent = location;
169
171
            if (view.directory.has_parent ()) { /* May not work for some protocols */
176
178
            /* Certain parents such as ftp:// will be returned as null as they are not browsable */
177
179
            if (parent != null) {
178
180
                user_path_change_request (parent, false, false);
 
181
                return true;
 
182
            } else {
 
183
                return false;
179
184
            }
180
185
        }
181
186