Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/MainWindow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,8 @@ namespace Terminal {
}

private void action_restore_closed_tab (GLib.SimpleAction action, GLib.Variant? param) {
notebook.add_new_tab (param.get_string ()); //TODO Restore icon?
notebook.add_new_tab (param.get_string ()); // TODO Restore icon?
notebook.after_tab_restored (param.get_string ());
}

private void action_new_tab () requires (current_terminal != null) {
Expand Down
17 changes: 6 additions & 11 deletions src/Widgets/TerminalView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -115,20 +115,15 @@ public class Terminal.TerminalView : Granite.Bin {
}

var menu = (Menu) tab_history_button.menu_model;
int position_in_menu = -1;
var path_in_menu = false;
int i;
for (i = 0; i < menu.get_n_items (); i++) {
if (path == menu.get_item_attribute_value (
i, Menu.ATTRIBUTE_TARGET, VariantType.STRING).get_string ()
) {
path_in_menu = true;
var position_in_menu = -1;
for (var i = 0; i < menu.get_n_items (); i++) {
if (path == menu.get_item_attribute_value (i, Menu.ATTRIBUTE_TARGET, VariantType.STRING).get_string ()) {
position_in_menu = i;
break;
}
}

if (path_in_menu) {
if (position_in_menu != -1) {
menu.remove (position_in_menu);
}

Expand Down Expand Up @@ -327,10 +322,10 @@ public class Terminal.TerminalView : Granite.Bin {
return term;
}

public void after_tab_restored (TerminalWidget term) {
public void after_tab_restored (string path) {
var menu = (Menu) tab_history_button.menu_model;
for (var i = 0; i < menu.get_n_items (); i++) {
if (term.terminal_id == menu.get_item_attribute_value (i, Menu.ATTRIBUTE_TARGET, VariantType.STRING).get_string ()) {
if (path == menu.get_item_attribute_value (i, Menu.ATTRIBUTE_TARGET, VariantType.STRING).get_string ()) {
menu.remove (i);
break;
}
Expand Down