Merge branch 'development' into MUSHclient

fiendish · Apr 9, 2018 · e376d1a · e376d1a
2 parents 6b409c3 + 247eec0
commit e376d1a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/MUSHclient/AardwolfPackageChanges.txt b/MUSHclient/AardwolfPackageChanges.txt
@@ -1,5 +1,8 @@
 Aardwolf Client Package Major Changes List
 
+r1989 snapshot
+- bug fix: In haste, it seems I accidentally undid message content preserving in the comm log across theme changes. Should be fixed.
+
 r1988 snapshot
 - misc change: The theme code is now namespaced for better predictability. Now you only have to not clobber one variable instead of dozens when writing a miniwindow plugin.
 

diff --git a/MUSHclient/lua/aard_requirements.lua b/MUSHclient/lua/aard_requirements.lua
@@ -5,7 +5,7 @@ require "checkplugin"
 SetOption("omit_date_from_save_files", 1)  -- slightly less clutter in settings files
 SetAlphaOption("terminal_identification", "MUSHclient-Aard") -- helps Lasher count for the 'clients' in-game command
 
-if not GetVariable("just_reloading") then
+if not GetVariable("aard_theme_just_reloading") then
    -- Edit the preferences db to stop opening the activity window at startup
    local aard_req_prefs_db = sqlite3.open(GetInfo(82))
    local aard_req_pref_activity_window = 1
@@ -32,4 +32,4 @@ if not GetVariable("just_reloading") then
    do_plugin_check_now("23832d1089f727f5f34abad8", "aard_soundpack") -- pre-made collection of common sound triggers
 end
 
-DeleteVariable("just_reloading")
+DeleteVariable("aard_theme_just_reloading")
diff --git a/MUSHclient/worlds/plugins/aard_channels_fiendish.xml b/MUSHclient/worlds/plugins/aard_channels_fiendish.xml
@@ -609,7 +609,7 @@ end
 
 function OnPluginClose ()
    WindowDelete(win)
-   if GetVariable("just_reloading") then
+   if GetVariable(Theme.reloading_variable) then
       local temp_tabs_data = {}
       for i,v in ipairs(tabs_rects) do
          temp_tabs_data[i] = {