Merge branch 'development' into MUSHclient

fiendish · Apr 10, 2018 · 4802060 · 4802060
2 parents e376d1a + 05a65fe
commit 4802060
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/MUSHclient/AardwolfPackageChanges.txt b/MUSHclient/AardwolfPackageChanges.txt
@@ -1,5 +1,8 @@
 Aardwolf Client Package Major Changes List
 
+r1990 snapshot
+- bug fix: Fix a string/int comparison bug in the communication log's findTab function. Thanks Crowley.
+
 r1989 snapshot
 - bug fix: In haste, it seems I accidentally undid message content preserving in the comm log across theme changes. Should be fixed.
 

diff --git a/MUSHclient/worlds/plugins/aard_channels_fiendish.xml b/MUSHclient/worlds/plugins/aard_channels_fiendish.xml
@@ -263,15 +263,15 @@ end
 function findTab(name)
    -- prefer named tabs first
    for i=1,num_tabs do
-      if tabs_names[i] and (tabs_names[i]:upper() == name:upper()) then
+      if tabs_names[i] and (tabs_names[i]:upper() == tostring(name):upper()) then
          return i
       end
    end
 
    -- but if the "name" is a number and there isn't a matching named tab,
    -- pick that number tab.
    for i=1,num_tabs do
-      if (tabs_names[i] == nil) and (tostring(i) == name) then
+      if (tabs_names[i] == nil) and (tostring(i) == tostring(name)) then
          return i
       end
    end