Skip to content

Commit e324d61

Browse files
committed
fix: bug with loading settings too fast
1 parent 7c51d59 commit e324d61

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

erisunitframes.lua

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,21 @@ euf_debug = false
5353
local isLoaded = false
5454

5555
local function initialize()
56-
-- load up settings
57-
local settings = config.load(defaults)
58-
local success, theme = pcall(require, 'themes/' .. settings.theme)
59-
if not success then
60-
windower.add_to_chat(8, 'EUF Failed to find: themes/' .. settings.theme .. '.lua')
56+
local windower_player = windower.ffxi.get_player()
57+
if windower_player ~= nil then
58+
-- load up settings
59+
local settings = config.load(defaults)
60+
local success, theme = pcall(require, 'themes/' .. settings.theme)
61+
if not success then
62+
windower.add_to_chat(8, 'EUF Failed to find: themes/' .. settings.theme .. '.lua')
63+
else
64+
config.save(settings)
65+
euf_debug = settings.debugMode
66+
ui:initialize(settings, theme)
67+
end
6168
else
62-
config.save(settings)
63-
euf_debug = settings.debugMode
64-
ui:initialize(settings, theme)
69+
coroutine.sleep(2)
70+
initialize()
6571
end
6672
end
6773

@@ -243,6 +249,7 @@ windower.register_event('addon command', function(command, ...)
243249
windower.add_to_chat(8, 'Reloading EUF...')
244250
ui:destroy()
245251
initialize()
252+
ui:show()
246253
windower.add_to_chat(8, 'Reload complete.')
247254
end
248255
end)

status_effects.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,7 @@ function status_effects:find_buff_consumptions_in_action(data)
445445
-- MAGIC SPELL
446446
--------------------------------------------------------------------------------
447447
if message_id == 2 -- cast and deal damage
448+
or message_id == 7 -- cast and recover hp
448449
or message_id == 252 -- cast and magic burst
449450
or message_id == 230 -- cast and gain status defensive
450451
or message_id == 236 -- cast and gain status offensive

0 commit comments

Comments
 (0)