always use faston when re-enabling after preset change

profezzorn · Jul 21, 2024 · c727b1e · c727b1e
1 parent 19d188e
commit c727b1e
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/props/prop_base.h b/props/prop_base.h
@@ -404,7 +404,7 @@ class PropBase : CommandParser, Looper, protected SaberBase, public ModeInterfac
     current_preset_.SetPreset(preset_num);
     AllocateBladeStyles();
     chdir(current_preset_.font.get());
-    if (previously_on.on()) On(EffectLocation(0, previously_on));
+    if (previously_on.on()) FastOn(EffectLocation(0, previously_on));
     if (announce) {
      PVLOG_STATUS << "Current Preset: " << current_preset_name() << "\n";
       SaberBase::DoNewFont();
@@ -427,17 +427,7 @@ class PropBase : CommandParser, Looper, protected SaberBase, public ModeInterfac
     // Set/Update Font & Style, skips Preon effect using FastOn (for use in Edit Mode and "fast" preset changes)
   void SetPresetFast(int preset_num) {
     PVLOG_DEBUG << "SetPresetFast(" << preset_num << ")\n";
-    TRACE(PROP, "start");
-    BladeSet previously_on = BladeOff();
-    SaveColorChangeIfNeeded();
-    // First free all styles, then allocate new ones to avoid memory
-    // fragmentation.
-    FreeBladeStyles();
-    current_preset_.SetPreset(preset_num);
-    AllocateBladeStyles();
-    chdir(current_preset_.font.get());
-    if (previously_on.on()) FastOn(EffectLocation(0, previously_on));
-    TRACE(PROP, "end");
+    SetPreset(preset_num, false);
   }
 
   // Update Preon IntArg in Edit Mode