From a48093ef74d69025c174baa3dbbb0003f0881733 Mon Sep 17 00:00:00 2001 From: Steven Jackson Date: Sun, 14 Sep 2014 00:44:05 -0500 Subject: [PATCH] global changes --- Interface/AddOns/SVUI/installer/setup.lua | 6 +++--- .../SVUI_TrackingDevice/SVUI_TrackingDevice.lua | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Interface/AddOns/SVUI/installer/setup.lua b/Interface/AddOns/SVUI/installer/setup.lua index 73bbb6f..4b919fb 100644 --- a/Interface/AddOns/SVUI/installer/setup.lua +++ b/Interface/AddOns/SVUI/installer/setup.lua @@ -56,7 +56,7 @@ LAYOUT PRESETS ]]-- local PRESET_DATA; -local function LoadPresetData() +local function LoadAllPresets() PRESET_DATA = {} PRESET_DATA["media"] = { @@ -1150,8 +1150,8 @@ local function _copyPresets(saved, preset) end end -local function LoadPresetData(category, theme) - if(not PRESET_DATA) then LoadPresetData() end +function SV:LoadPresetData(category, theme) + if(not PRESET_DATA) then LoadAllPresets() end if(PRESET_DATA and PRESET_DATA[category] and PRESET_DATA[category]["link"]) then theme = theme or "default" local saved = PRESET_DATA[category]["link"] diff --git a/Interface/AddOns/SVUI_TrackingDevice/SVUI_TrackingDevice.lua b/Interface/AddOns/SVUI_TrackingDevice/SVUI_TrackingDevice.lua index e4eea51..0db6c34 100644 --- a/Interface/AddOns/SVUI_TrackingDevice/SVUI_TrackingDevice.lua +++ b/Interface/AddOns/SVUI_TrackingDevice/SVUI_TrackingDevice.lua @@ -317,6 +317,7 @@ do end local function _getpos(map, mapFloor, x, y) + if not map then return end if (mapFloor ~= 0) then map = rawget(map, mapFloor) or _dungeons[map.origin][mapFloor]; end -- 1.7.9.5