From 6fb3c2ef6cc0d987127a0df07e25a236c57a27f5 Mon Sep 17 00:00:00 2001 From: Buds Date: Tue, 13 Apr 2021 16:22:49 +0200 Subject: [PATCH 1/4] CB_Laucher: fix nil error when right clicking entries --- modules/CB_Lauchers_LibQTip.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/CB_Lauchers_LibQTip.lua b/modules/CB_Lauchers_LibQTip.lua index 9bede50..472dd2b 100755 --- a/modules/CB_Lauchers_LibQTip.lua +++ b/modules/CB_Lauchers_LibQTip.lua @@ -31,7 +31,7 @@ dataobj = ldb:NewDataObject(addonName, { if button == "RightButton" then if _G.IsModifierKeyDown() then mainmenu(self, button, ...) - else + elseif dataobj.OpenOptions then dataobj:OpenOptions() end else From 43d7dc1d80ef34a5b6a7832b2fdb360993b1d6fb Mon Sep 17 00:00:00 2001 From: Buds Date: Tue, 13 Apr 2021 16:24:01 +0200 Subject: [PATCH 2/4] CB_GameMusic: fix mousewheel --- modules/CB_GameMusic.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/CB_GameMusic.lua b/modules/CB_GameMusic.lua index 251e849..e362621 100755 --- a/modules/CB_GameMusic.lua +++ b/modules/CB_GameMusic.lua @@ -27,7 +27,7 @@ function dataobj:OnMouseWheel(vector) vol = vol + step if vol > 1 then vol = 1 end if vol < 0 then vol = 0 end - SetCVar(vol, voltypeCVar); + SetCVar(cVar, vol); dataobj.text = "Master: "..math.floor((_G.GetCVar(cVar)*100)).."%" end From ad9bbce6c2a3bf6e687eeef10c75f1bd6bc8f41e Mon Sep 17 00:00:00 2001 From: Buds Date: Tue, 13 Apr 2021 16:31:35 +0200 Subject: [PATCH 3/4] CB_GameMusic.lua: show volume on load --- modules/CB_GameMusic.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/CB_GameMusic.lua b/modules/CB_GameMusic.lua index e362621..87ec3b3 100755 --- a/modules/CB_GameMusic.lua +++ b/modules/CB_GameMusic.lua @@ -5,11 +5,13 @@ local debug = ChocolateBar and ChocolateBar.debug or function() end local GameMusic = {} local addonName = "CB_Entertainer" +local volumeText = "Master: "..math.floor((_G.GetCVar("Sound_MasterVolume")*100)).."%" + local dataobj = LibStub("LibDataBroker-1.1"):NewDataObject(addonName, { type = "data source", --icon = "Interface\\AddOns\\ChocolateBar\\pics\\ChocolatePiece", label = addonName, - text = "Volume: ---", + text = volumeText, OnClick = OnClick, OnMouseWheel = OnMouseWheel, ChocolateBar = true From e0b4a8ba895e49bc580de4c7f0946f2c29f044f7 Mon Sep 17 00:00:00 2001 From: Buds Date: Sat, 17 Apr 2021 19:52:56 +0200 Subject: [PATCH 4/4] fix UnitInVehicle error on classic --- Jostle.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jostle.lua b/Jostle.lua index 3d33652..bb62b1a 100755 --- a/Jostle.lua +++ b/Jostle.lua @@ -132,7 +132,7 @@ function Jostle:PlayerFrame_SequenceFinished() end local function LockMainMenuBar() - if not InCombatLockdown() and not UnitInVehicle("Player") then + if not InCombatLockdown() and (not ChocolateBar.isClassicWoW and not UnitInVehicle("Player")) then MainMenuBar:SetMovable(true) MainMenuBar:SetUserPlaced(true) ChocolateBar:Debug("LockMainMenuBar")