Skip to content

Commit

Permalink
flash_image: use Override_Active_Slot instead of bootctrl
Browse files Browse the repository at this point in the history
Change-Id: I985d644ccb1e3bc8f9f9da77798d7bbcb7b84419
  • Loading branch information
CaptainThrowback authored and corsicanu committed May 30, 2022
1 parent b7e587e commit 2c094b8
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions gui/action.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1927,9 +1927,9 @@ int GUIAction::flashimage(std::string arg __unused)
string current_slot = PartitionManager.Get_Active_Slot_Display();
bool pre_op_status = PartitionManager.Flash_Image(path, filename);

PartitionManager.Set_Active_Slot(current_slot == "A" ? "B" : "A");
PartitionManager.Override_Active_Slot(current_slot == "A" ? "B" : "A");
op_status = (int) !(pre_op_status && PartitionManager.Flash_Image(path, filename));
PartitionManager.Set_Active_Slot(current_slot);
PartitionManager.Override_Active_Slot(current_slot);

DataManager::SetValue("tw_flash_both_slots", 0);
flag = false;
Expand Down Expand Up @@ -2490,6 +2490,7 @@ int GUIAction::mergesnapshots(string arg __unused) {
operation_end(op_status);
return 0;
}

//SHRP_GUI_Funcs()
int GUIAction::shrp_init(std::string arg __unused){
LOGINFO("Running GUI function : shrp_init\n");
Expand Down

0 comments on commit 2c094b8

Please sign in to comment.