mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: Crash when undo multiple times 

Change-Id: Ie2e06d294e7e31ce050e8f63308e45c076130af6
(cherry picked from commit ca4b9db007f7e839da768424484c098988cbc3f0)
This commit is contained in:
zhimin.zeng 2022-08-25 13:05:47 +08:00 committed by Lane.Wei
parent 36ca76c2a4
commit a85dc1ef67
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/slic3r/GUI/Plater.cpp
View File

@ -6259,8 +6259,7 @@ void Plater::priv::undo()
// BBS: undo-redo until modify record // BBS: undo-redo until modify record
while (--it_current != snapshots.begin() && !snapshot_modifies_project(*it_current)); while (--it_current != snapshots.begin() && !snapshot_modifies_project(*it_current));
if (it_current == snapshots.begin()) return; if (it_current == snapshots.begin()) return;
while (--it_current != snapshots.begin() && !snapshot_modifies_project(*it_current)); this->undo_redo_to(it_current);
this->undo_redo_to(++it_current);
} }
void Plater::priv::redo() void Plater::priv::redo()
@ -6269,8 +6268,10 @@ void Plater::priv::redo()
auto it_current = std::lower_bound(snapshots.begin(), snapshots.end(), UndoRedo::Snapshot(this->undo_redo_stack().active_snapshot_time())); auto it_current = std::lower_bound(snapshots.begin(), snapshots.end(), UndoRedo::Snapshot(this->undo_redo_stack().active_snapshot_time()));
// BBS: undo-redo until modify record // BBS: undo-redo until modify record
while (it_current != snapshots.end() && !snapshot_modifies_project(*it_current++)); while (it_current != snapshots.end() && !snapshot_modifies_project(*it_current++));
if (it_current != snapshots.end()) if (it_current != snapshots.end()) {
this->undo_redo_to(it_current); while (it_current != snapshots.end() && !snapshot_modifies_project(*it_current++));
this->undo_redo_to(--it_current);
}
} }
void Plater::priv::undo_redo_to(size_t time_to_load) void Plater::priv::undo_redo_to(size_t time_to_load)
@ -6407,6 +6408,9 @@ void Plater::priv::undo_redo_to(std::vector<UndoRedo::Snapshot>::const_iterator
} }
if (need_update) { if (need_update) {
// update print to current plate (preview->m_process)
this->partplate_list.update_slice_context_to_current_plate(this->background_process);
this->preview->update_gcode_result(this->partplate_list.get_current_slice_result());
this->update(); this->update();
} }
} }