From 5b6e68116b80efba1b9ae3e4f521db971bad129d Mon Sep 17 00:00:00 2001
From: lxsang <xsang.le@gmail.com>
Date: Thu, 13 Sep 2018 21:41:14 +0200
Subject: [PATCH] fix bug

---
 src/core/tags/afx-button.tag     |  4 ++--
 src/packages/AntOSDK/main.coffee | 31 ++++++++++++++++++++++---------
 src/themes/antos/afx-button.css  |  2 +-
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/core/tags/afx-button.tag b/src/core/tags/afx-button.tag
index 565c16c..84fc2cb 100644
--- a/src/core/tags/afx-button.tag
+++ b/src/core/tags/afx-button.tag
@@ -1,5 +1,5 @@
-<afx-button class= { btactive: selected }>
-    <button disabled={ enable == false } onclick="{ _onbtclick }" ref = "mybtn" > 
+<afx-button >
+    <button class= { btactive: selected } disabled={ enable == false } onclick="{ _onbtclick }" ref = "mybtn" > 
         <afx-label color = {color} icon={icon} iconclass = {iconclass} text = {text} ></afx-label>
     </button>
     <script>
diff --git a/src/packages/AntOSDK/main.coffee b/src/packages/AntOSDK/main.coffee
index a887ec4..1344891 100644
--- a/src/packages/AntOSDK/main.coffee
+++ b/src/packages/AntOSDK/main.coffee
@@ -284,16 +284,29 @@ class AntOSDK extends this.OS.GUI.BaseApplication
         me = @
         me.prjfile = file
         if(me.tabarea)
-            file.read (d) ->
+            file.read (data) ->
                 me.log "INFO", __("Opening {0}", me.prjfile.path)
-                me.tabarea.set "selected", -1
-                me.tabarea.set "items", []
-                me.currfile = "#{d.root}/README.md".asFileHandler()
-                me.currfile.dirty = false
-                me.chdir d.root if d.root
-                me.prjfile.cache = d
-                me.log "INFO", __("Opening {0}", me.currfile.path)
-                me.open me.currfile
+                fn = (d, dt) ->
+                    me.tabarea.set "selected", -1
+                    me.tabarea.set "items", []
+                    me.currfile = "#{d.root}/README.md".asFileHandler()
+                    me.currfile.dirty = dt
+                    me.chdir d.root if d.root
+                    me.prjfile.cache = d
+                    me.log "INFO", __("Opening {0}", me.currfile.path)
+                    me.open me.currfile
+                # verify if the path is ok
+                data.root.asFileHandler().onready () ->
+                    fn(data, false)
+                , (e) ->
+                    # try the current folder of the project file
+                    pr = file.parent()
+                    me.log "INFO", __("Project root folder not found, try {0}", pr)
+                    pr.asFileHandler().onready () ->
+                        data.root = pr
+                        fn(data, true)
+                    , (e) ->
+                        me.error __("Cannot find the project root, please modify the project file")
             ,"json"
         else
             me.init()
diff --git a/src/themes/antos/afx-button.css b/src/themes/antos/afx-button.css
index e380e16..c582626 100644
--- a/src/themes/antos/afx-button.css
+++ b/src/themes/antos/afx-button.css
@@ -18,7 +18,7 @@ afx-button i.icon-style {
     display: inline-block;
     float:left;
 }
-afx-button button:active, afx-button.btactive button {
+afx-button button:active, afx-button button.btactive {
     background-color: #2786F3;
     color: white;
     border: 1px solid #dedede;