Fixed conflicts after merge with master

2021-05-20 15:37:56 +02:00 · 2021-05-20 15:37:56 +02:00 · d13c550968
commit d13c550968
parent 33d489df30 2bd3e018b1
8 changed files with 73 additions and 8 deletions
--- a/src/slic3r/GUI/GCodeViewer.cpp
+++ b/src/slic3r/GUI/GCodeViewer.cpp
@ -596,7 +596,7 @@ void GCodeViewer::load(const GCodeProcessor::Result& gcode_result, const Print&
    m_last_result_id = gcode_result.id;

    // release gpu memory, if used
-    reset();
+    reset(); 

 #if ENABLE_GCODE_WINDOW
    m_sequential_view.gcode_window.set_filename(gcode_result.filename);