Updates

Source/Atomic/UI/TBUI.cpp

@@ -498,7 +498,7 @@ static bool InvokeShortcut(int key, SPECIAL_KEY special_key, MODIFIER_KEYS modif
 #else
     bool shortcut_key = (modifierkeys & TB_CTRL) ? true : false;
 #endif
-    if (!TBWidget::focused_widget || !down || !shortcut_key)
+    if (!TBWidget::focused_widget || !down || (!shortcut_key && special_key ==TB_KEY_UNDEFINED))
         return false;
     bool reverse_key = (modifierkeys & TB_SHIFT) ? true : false;
     int upper_key = toupr_ascii(key);
@@ -528,10 +528,18 @@ static bool InvokeShortcut(int key, SPECIAL_KEY special_key, MODIFIER_KEYS modif
         id = TBIDC("close");
     else if (upper_key == 'F')
         id = TBIDC("find");
+ #ifdef ATOMIC_PLATFORM_OSX
     else if (upper_key == 'G' && (modifierkeys & TB_SHIFT))
         id = TBIDC("findprev");
     else if (upper_key == 'G')
         id = TBIDC("findnext");
+#else
+    else if (special_key == TB_KEY_F3 && (modifierkeys & TB_SHIFT))
+        id = TBIDC("findprev");
+    else if (special_key == TB_KEY_F3)
+        id = TBIDC("findnext");
+
+#endif
     else if (upper_key == 'P')
         id = TBIDC("play");
     else if (upper_key == 'I')

Source/AtomicEditor/Source/Build/BuildWindows.cpp

@@ -8,6 +8,7 @@
 #include "../Project/AEProject.h"
 
 #include "../Project/ProjectUtils.h"
+#include "License/AELicenseSystem.h"
 
 #include "BuildSystem.h"
 #include "BuildWindows.h"
@@ -54,6 +55,20 @@ void BuildWindows::Build(const String& buildPath)
 
     Initialize();
 
+    BuildSystem* buildSystem = GetSubsystem<BuildSystem>();
+
+// BEGIN LICENSE MANAGEMENT
+    LicenseSystem *licenseSystem = GetSubsystem<LicenseSystem>();
+    if (licenseSystem->IsStandardLicense())
+    {
+        if (containsMDL_)
+        {
+            buildSystem->BuildComplete(AE_PLATFORM_WINDOWS, buildPath_, false, true);
+            return;
+        }
+    }
+// END LICENSE MANAGEMENT
+
     FileSystem* fileSystem = GetSubsystem<FileSystem>();
     if (fileSystem->DirExists(buildPath_))
         fileSystem->RemoveDir(buildPath_, true);
@@ -74,7 +89,6 @@ void BuildWindows::Build(const String& buildPath)
 
     fileSystem->Copy(buildSourceDir + "/AtomicPlayer.exe", buildPath_ + "/AtomicPlayer.exe");
 
-    BuildSystem* buildSystem = GetSubsystem<BuildSystem>();
     buildSystem->BuildComplete(AE_PLATFORM_WINDOWS, buildPath_);
 
 }