From 7d40976de9f0a665f1b18a51bb35e8caea25edd3 Mon Sep 17 00:00:00 2001
From: Jerome St-Louis <jerome@ecere.com>
Date: Thu, 8 Mar 2012 12:44:00 -0500
Subject: [PATCH] installer: Fixed crash on configuration by setting the
 SettingsContainer's dataClass to IDESettings; JSON: Fixed ambiguous (wrong)
 || and &&

---
 ecere/src/sys/JSON.ec      | 2 +-
 installer/src/installer.ec | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ecere/src/sys/JSON.ec b/ecere/src/sys/JSON.ec
index be53552..faf4563 100644
--- a/ecere/src/sys/JSON.ec
+++ b/ecere/src/sys/JSON.ec
@@ -328,7 +328,7 @@ public:
       if(ch == '{')
       {
          result = success;
-         if(objectType && objectType.type == noHeadClass || objectType.type == normalClass)
+         if(objectType && (objectType.type == noHeadClass || objectType.type == normalClass))
          {
             *object = eInstance_New(objectType);
          }
diff --git a/installer/src/installer.ec b/installer/src/installer.ec
index 88dfe99..38d017c 100644
--- a/installer/src/installer.ec
+++ b/installer/src/installer.ec
@@ -1242,6 +1242,7 @@ class InstallThread : Thread
          {
             driver = "JSON";
             dataOwner = &settings;
+            dataClass = class(IDESettings);
          };
          CompilerConfig compiler;
          installProgress.installing.text = $"Configuring ECERE IDE...";
-- 
1.8.3.1