aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS_TheReturn
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-04-25 12:47:20 -0400
committerMichael <[email protected]>2017-04-25 12:47:20 -0400
commit0f2fc4271ba75e1d2314fbc865682d53472c8d11 (patch)
tree47287ddb1bcf0436f34888d7cfe53c031815dec4 /ShiftOS_TheReturn
parent91c6b3bf1c709cc392d52391407a70feabc9214b (diff)
downloadshiftos_thereturn-0f2fc4271ba75e1d2314fbc865682d53472c8d11.tar.gz
shiftos_thereturn-0f2fc4271ba75e1d2314fbc865682d53472c8d11.tar.bz2
shiftos_thereturn-0f2fc4271ba75e1d2314fbc865682d53472c8d11.zip
Fix bug with App Launcher & upgrades
Diffstat (limited to 'ShiftOS_TheReturn')
-rw-r--r--ShiftOS_TheReturn/AppLauncherDaemon.cs11
1 files changed, 7 insertions, 4 deletions
diff --git a/ShiftOS_TheReturn/AppLauncherDaemon.cs b/ShiftOS_TheReturn/AppLauncherDaemon.cs
index d1506b2..716a6a3 100644
--- a/ShiftOS_TheReturn/AppLauncherDaemon.cs
+++ b/ShiftOS_TheReturn/AppLauncherDaemon.cs
@@ -77,9 +77,9 @@ namespace ShiftOS.Engine
{
if (type.GetInterfaces().Contains(typeof(IShiftOSWindow)))
{
+ bool isAllowed = true;
foreach (var attr in type.GetCustomAttributes(false))
{
- bool isAllowed = true;
if(attr is MultiplayerOnlyAttribute)
{
if(KernelWatchdog.MudConnected == false)
@@ -92,10 +92,13 @@ namespace ShiftOS.Engine
{
if (attr is LauncherAttribute)
{
- var launch = attr as LauncherAttribute;
- if (launch.UpgradeInstalled)
+ if (Shiftorium.UpgradeAttributesUnlocked(type))
{
- win.Add(new LauncherItem { DisplayData = launch, LaunchType = type });
+ var launch = attr as LauncherAttribute;
+ if (launch.UpgradeInstalled)
+ {
+ win.Add(new LauncherItem { DisplayData = launch, LaunchType = type });
+ }
}
}
}