sdk:ide: fixed debugger stopped on compiling other config> http://ecere.com/mantis...

diff --git a/ide/ide.epj b/ide/ide.epj
index 11c0316..ad8f9e6 100644 (file)
--- a/ide/ide.epj
+++ b/ide/ide.epj
@@ -53,8 +53,7 @@
             "Debug" : true,
             "Optimization" : "None",
             "PreprocessorDefinitions" : [
-               "_DEBUG",
-               "SETTINGS_TEST"
+               "_DEBUG"
             ],
             "Libraries" : [
                "ecere"

diff --git a/ide/src/debugger/Debugger.ec b/ide/src/debugger/Debugger.ec
index e91c131..8364573 100644 (file)
--- a/ide/src/debugger/Debugger.ec
+++ b/ide/src/debugger/Debugger.ec
@@ -621,16 +621,11 @@ class Debugger
 
    // PUBLIC MEMBERS
 
-   property bool isActive
+   property bool isActiveForCurrentConfig
    {
       get
       {
-         if(ide.project)
-         {
-            if((state == running || state == stopped) && prjConfig == ide.project.config)
-               return true;
-         }
-         return false;
+         return ide.project && ide.project.config == prjConfig && (state == running || state == stopped) ? true : false;
       }
    }
 

diff --git a/ide/src/ide.ec b/ide/src/ide.ec
index 0c08878..fd926d1 100644 (file)
--- a/ide/src/ide.ec
+++ b/ide/src/ide.ec
@@ -1545,7 +1545,7 @@ class IDE : Window
 
    bool DontTerminateDebugSession(char * title)
    {
-      if(debugger.isActive)
+      if(debugger.isActiveForCurrentConfig)
       {
          if(MessageBox { type = yesNo, master = ide, 
                            contents = "Do you want to terminate the debugging session in progress?", 

diff --git a/ide/src/project/ProjectView.ec b/ide/src/project/ProjectView.ec
index 2c62b51..1735968 100644 (file)
--- a/ide/src/project/ProjectView.ec
+++ b/ide/src/project/ProjectView.ec
@@ -1247,7 +1247,7 @@ class ProjectView : Window
       {
          DirExpression targetDir = prj.targetDir;
 
-         if(buildType != run && prj == project)
+         if(buildType != run && prj == project && ide.debugger.isActiveForCurrentConfig)
             ide.debugger.Stop();
          
          // TODO: Disabled until problems fixed... is it fixed?