intercept builds less aggressively (closes #10)

code-orchestra · Jun 18, 2013 · ae35d6d · ae35d6d
1 parent d3a6e1f
commit ae35d6d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/ColtPlugin.fdz b/ColtPlugin.fdz
diff --git a/ColtPlugin/ColtPlugin.csproj b/ColtPlugin/ColtPlugin.csproj
@@ -54,7 +54,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x86</PlatformTarget>
-    <OutputPath>..\..\..\FlashDevelop\Bin\Debug\Plugins\</OutputPath>
+    <OutputPath>..\..\FD4\FlashDevelop\Bin\Debug\Plugins\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -106,15 +106,15 @@
     <Compile Include="Settings.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\PluginCore\PluginCore.csproj">
+    <ProjectReference Include="..\..\FD4\External\Plugins\ProjectManager\ProjectManager.csproj">
+      <Project>{78101C01-E186-4954-B1DD-DEBB7905FAD8}</Project>
+      <Name>ProjectManager</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\FD4\PluginCore\PluginCore.csproj">
       <Project>{61885F70-B4DC-4B44-852D-5D6D03F2A734}</Project>
       <Name>PluginCore</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\ProjectManager\ProjectManager.csproj">
-      <Project>{E57AC379-B0A0-4D6F-BFB2-88639B280205}</Project>
-      <Name>ProjectManager</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Forms\FirstTimeDialog.resx">
@@ -154,7 +154,7 @@
     <EmbeddedResource Include="Resources\colt.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ASCompletion\ASCompletion.csproj">
+    <ProjectReference Include="..\..\FD4\External\Plugins\ASCompletion\ASCompletion.csproj">
       <Project>{4EBF2653-9654-4E40-880E-0046B3D6210E}</Project>
       <Name>ASCompletion</Name>
     </ProjectReference>

diff --git a/ColtPlugin/PluginMain.cs b/ColtPlugin/PluginMain.cs
@@ -152,7 +152,7 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
                     else if ((cmd == "ProjectManager.BuildingProject") || (cmd == "ProjectManager.TestingProject"))
                     {
                         // todo: FD might send this for projects other than PluginBase.CurrentProject - figure out how to catch that
-                        if (settingObject.InterceptBuilds && allowBuildInterception)
+                        if (settingObject.InterceptBuilds && allowBuildInterception && toolbarButton2.Enabled)
                         {
                             new AppStarter(ProductionBuild, cmd == "ProjectManager.TestingProject");
 
@@ -528,7 +528,7 @@ private void ProductionBuild(Boolean run)
         {
             // make sure the COLT project is open
             // todo: currently no way to know if this fails, check the state before running the build in the future
-            if (toolbarButton2.Enabled) FindAndOpen(false); else ExportAndOpen(false);
+            FindAndOpen(false);
 
             try
             {