Jesse Duffield a82134f41c Fix race condition ... Our refresh code may try to push a context. It does this in two places: 1) when all merge conflicts are resolved, we push a 'continue merge?' confirmation context 2) when all conflicts of a given file are resolved and we're in the merge conflicts context, we push the files context. Sometimes we push the confirmation context and then push the files context over it, so the user never sees the confirmation context. This commit fixes the race condition by adding a check to ensure that we're still in the merge conflicts panel before we try escaping from it		2023-05-16 21:01:38 +10:00
..
helpers	Fix race condition	2023-05-16 21:01:38 +10:00
attach.go	Begin refactoring gui	2023-04-30 13:19:52 +10:00
base_controller.go	Begin refactoring gui	2023-04-30 13:19:52 +10:00
basic_commits_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
bisect_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
branches_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
command_log_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
commit_description_controller.go	Split commit message panel into commit summary and commit description panel	2023-04-30 13:19:53 +10:00
commit_message_controller.go	Retain commit message when cycling history	2023-04-30 13:19:54 +10:00
commits_files_controller.go	fix rendering of commit files view	2023-04-30 13:19:53 +10:00
common.go	lots of changes	2023-04-30 13:19:53 +10:00
confirmation_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
context_lines_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
custom_command_action.go	move custom command action into its own file	2023-04-30 13:19:53 +10:00
custom_patch_options_menu_action.go	move custom patch options menu action to controllers package	2023-04-30 13:19:53 +10:00
diffing_menu_action.go	move diffing menu action to controller	2023-04-30 13:19:53 +10:00
files_controller.go	Split commit message panel into commit summary and commit description panel	2023-04-30 13:19:53 +10:00
files_remove_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
filtering_menu_action.go	Allow the selected line of a list view to be outside the visible area	2023-05-11 13:23:58 +02:00
git_flow_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
global_controller.go	move toggle whitespace action to controllers package	2023-04-30 13:19:53 +10:00
jump_to_side_window_controller.go	move side window actions to controllers package	2023-04-30 13:19:53 +10:00
list_controller.go	Allow the selected line of a list view to be outside the visible area	2023-05-11 13:23:58 +02:00
local_commits_controller.go	merge master into refactor-better-encapsulation	2023-05-02 19:05:42 +10:00
menu_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
merge_conflicts_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
options_menu_action.go	move another action into controller	2023-04-30 13:19:53 +10:00
patch_building_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
patch_explorer_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
quit_actions.go	move quit actions to controller	2023-04-30 13:19:53 +10:00
reflog_commits_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
remote_branches_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
remotes_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
screen_mode_actions.go	move more actions into controller	2023-04-30 13:19:53 +10:00
side_window_controller.go	move side window actions to controllers package	2023-04-30 13:19:53 +10:00
snake_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
staging_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
stash_controller.go	Allow the selected line of a list view to be outside the visible area	2023-05-11 13:23:58 +02:00
status_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
sub_commits_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
submodules_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
suggestions_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
switch_to_diff_files_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
switch_to_sub_commits_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
sync_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
tags_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
toggle_whitespace_action.go	move toggle whitespace action to controllers package	2023-04-30 13:19:53 +10:00
types.go	introduce Ref interface	2022-04-02 17:04:42 +11:00
undo_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
vertical_scroll_controller.go	lots of changes	2023-04-30 13:19:53 +10:00
workspace_reset_controller.go	lots of changes	2023-04-30 13:19:53 +10:00