X-Git-Url: http://ecere.com/cgi-bin/gitweb.cgi?p=sdk;a=blobdiff_plain;f=ide%2Fsrc%2Fproject%2FProjectView.ec;h=f87f5bb05adf6c3b8e370d8361c528b9748fb72c;hp=17359683c8ee3423265a2902240a7971ba74597a;hb=15dd70a18ecbd8bdfccfd6ed2f179090f03de825;hpb=085c44805942b121360c1ba49c56ba09b333793e;ds=sidebyside

diff --git a/ide/src/project/ProjectView.ec b/ide/src/project/ProjectView.ec
index 1735968..f87f5bb 100644
--- a/ide/src/project/ProjectView.ec
+++ b/ide/src/project/ProjectView.ec
@@ -822,7 +822,7 @@ class ProjectView : Window
 
    ~ProjectView()
    {
-      ide.debugger.Stop();
+      DebugStop();
       ide.DestroyTemporaryProjectDir();
       if(project)
       {
@@ -982,7 +982,7 @@ class ProjectView : Window
          if(node)
             prj = node.project;
       }
-      if(prj != project || !ide.DontTerminateDebugSession("Project Build"))
+      if(/*prj != project || */!prj.configIsInDebugSession || !ide.DontTerminateDebugSession("Project Build"))
          BuildInterrim(prj, build, false);
       return true;
    }
@@ -1247,8 +1247,8 @@ class ProjectView : Window
       {
          DirExpression targetDir = prj.targetDir;
 
-         if(buildType != run && prj == project && ide.debugger.isActiveForCurrentConfig)
-            ide.debugger.Stop();
+         if(buildType != run/* && prj == project*/ && prj.configIsInDebugSession)
+            DebugStop();
          
          // TODO: Disabled until problems fixed... is it fixed?
          if(buildType == rebuild || (prj.config && prj.config.compilingModified))