Remove temporary aliases when calling resetProfile() (Mudlet#3233)

* Remove temporary aliases when calling resetProfile() * Ensure aliases are disabled, cleaned up and then enabled when resetting profile
shacknetisp · Nov 17, 2019 · 1e836fa · 1e836fa
1 parent 64ee0ed
commit 1e836fa
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/src/AliasUnit.cpp b/src/AliasUnit.cpp
@@ -138,6 +138,16 @@ void AliasUnit::removeAliasRootNode(TAlias* pT)
     mAliasRootNodeList.remove(pT);
 }
 
+void AliasUnit::removeAllTempAliases()
+{
+    for (auto alias : mAliasRootNodeList) {
+        if (alias->isTemporary()) {
+            alias->setIsActive(false);
+            markCleanup(alias);
+        }
+    }
+}
+
 TAlias* AliasUnit::getAlias(int id)
 {
     QMutexLocker locker(&mAliasUnitLock);

diff --git a/src/AliasUnit.h b/src/AliasUnit.h
@@ -49,6 +49,7 @@ class AliasUnit
     bool enableAlias(const QString&);
     bool disableAlias(const QString&);
     bool killAlias(const QString& name);
+    void removeAllTempAliases();
     bool registerAlias(TAlias* pT);
     void unregisterAlias(TAlias* pT);
     void uninstall(const QString&);

diff --git a/src/Host.cpp b/src/Host.cpp
@@ -387,6 +387,7 @@ void Host::reloadModule(const QString& reloadModuleName)
 
 void Host::resetProfile_phase1()
 {
+    mAliasUnit.stopAllTriggers();
     mTriggerUnit.stopAllTriggers();
     mTimerUnit.stopAllTriggers();
     mKeyUnit.stopAllTriggers();
@@ -399,10 +400,12 @@ void Host::resetProfile_phase1()
 
 void Host::resetProfile_phase2()
 {
+    getAliasUnit()->removeAllTempAliases();
     getTimerUnit()->removeAllTempTimers();
     getTriggerUnit()->removeAllTempTriggers();
     getKeyUnit()->removeAllTempKeys();
 
+    mAliasUnit.doCleanup();
     mTimerUnit.doCleanup();
     mTriggerUnit.doCleanup();
     mKeyUnit.doCleanup();
@@ -421,6 +424,7 @@ void Host::resetProfile_phase2()
     // All the Timers are NOT compiled here;
     mResetProfile = false;
 
+    mAliasUnit.reenableAllTriggers();
     mTimerUnit.reenableAllTriggers();
     mTriggerUnit.reenableAllTriggers();
     mKeyUnit.reenableAllTriggers();