Merge pull request #11 from mrbuds/master

Fixes for CB_GameMusic & CB_Laucher

Jostle.lua

@@ -133,7 +133,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")

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
@@ -27,7 +29,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
 

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