from retail
This commit is contained in:
@@ -439,14 +439,14 @@ end
|
||||
|
||||
local delayedImport = CreateFrame("FRAME")
|
||||
|
||||
local function ImportNow(data, children, target, sender, callbackFunc)
|
||||
local function ImportNow(data, children, target, linkedAuras, sender, callbackFunc)
|
||||
if InCombatLockdown() then
|
||||
WeakAuras.prettyPrint(L["Importing will start after combat ends."])
|
||||
|
||||
delayedImport:RegisterEvent("PLAYER_REGEN_ENABLED")
|
||||
delayedImport:SetScript("OnEvent", function()
|
||||
delayedImport:UnregisterEvent("PLAYER_REGEN_ENABLED")
|
||||
ImportNow(data, children, target, sender, callbackFunc)
|
||||
ImportNow(data, children, target, linkedAuras, sender, callbackFunc)
|
||||
end)
|
||||
return
|
||||
end
|
||||
@@ -455,11 +455,11 @@ local function ImportNow(data, children, target, sender, callbackFunc)
|
||||
if not WeakAuras.IsOptionsOpen() then
|
||||
WeakAuras.OpenOptions()
|
||||
end
|
||||
Private.OpenUpdate(data, children, target, sender, callbackFunc)
|
||||
Private.OpenUpdate(data, children, target, linkedAuras, sender, callbackFunc)
|
||||
end
|
||||
end
|
||||
|
||||
function WeakAuras.Import(inData, target, callbackFunc)
|
||||
function WeakAuras.Import(inData, target, callbackFunc, linkedAuras)
|
||||
local data, children, version
|
||||
if type(inData) == 'string' then
|
||||
-- encoded data
|
||||
@@ -495,7 +495,7 @@ function WeakAuras.Import(inData, target, callbackFunc)
|
||||
if highestVersion > WeakAuras.InternalVersion() then
|
||||
-- Do not run PreAdd but still show Import Window
|
||||
tooltipLoading = nil;
|
||||
return ImportNow(data, children, target, nil, callbackFunc)
|
||||
return ImportNow(data, children, target, linkedAuras, nil, callbackFunc)
|
||||
end
|
||||
]]
|
||||
|
||||
@@ -529,7 +529,7 @@ function WeakAuras.Import(inData, target, callbackFunc)
|
||||
end
|
||||
|
||||
tooltipLoading = nil;
|
||||
return ImportNow(data, children, target, nil, callbackFunc)
|
||||
return ImportNow(data, children, target, linkedAuras, nil, callbackFunc)
|
||||
end
|
||||
|
||||
local function crossRealmSendCommMessage(prefix, text, target, queueName, callbackFn, callbackArg)
|
||||
@@ -659,7 +659,7 @@ Comm:RegisterComm("WeakAuras", function(prefix, message, distribution, sender)
|
||||
end
|
||||
|
||||
ItemRefTooltip:Hide()
|
||||
ImportNow(data, children, nil, sender)
|
||||
ImportNow(data, children, nil, nil, sender)
|
||||
elseif(received.m == "dR") then
|
||||
if(Private.linked and Private.linked[received.d] and Private.linked[received.d] > GetTime() - linkValidityDuration) then
|
||||
TransmitDisplay(received.d, sender);
|
||||
|
||||
Reference in New Issue
Block a user