From e6a428f85f0d1c7e50dc8262a7687ec2f1ce2d7b Mon Sep 17 00:00:00 2001
From: Maran <maran.hidskes@gmail.com>
Date: Mon, 14 Jul 2014 15:25:01 +0200
Subject: Make the reload watcher use windows-safe paths

---
 ethereal/html_container.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ethereal/html_container.go')

diff --git a/ethereal/html_container.go b/ethereal/html_container.go
index 1e835eebc..2ad06ffb5 100644
--- a/ethereal/html_container.go
+++ b/ethereal/html_container.go
@@ -59,7 +59,7 @@ func (app *HtmlApplication) RootFolder() string {
 	if err != nil {
 		return ""
 	}
-	return path.Dir(folder.RequestURI())
+	return path.Dir(ethutil.WindonizePath(folder.RequestURI()))
 }
 func (app *HtmlApplication) RecursiveFolders() []os.FileInfo {
 	files, _ := ioutil.ReadDir(app.RootFolder())
-- 
cgit 


From dce0ccf4902def623f33af3ce3878d1c1512101e Mon Sep 17 00:00:00 2001
From: Maran <maran.hidskes@gmail.com>
Date: Mon, 14 Jul 2014 15:29:02 +0200
Subject: Don't silently fail on watcher creation

---
 ethereal/html_container.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'ethereal/html_container.go')

diff --git a/ethereal/html_container.go b/ethereal/html_container.go
index 2ad06ffb5..04136f801 100644
--- a/ethereal/html_container.go
+++ b/ethereal/html_container.go
@@ -8,7 +8,6 @@ import (
 	"github.com/go-qml/qml"
 	"github.com/howeyc/fsnotify"
 	"io/ioutil"
-	"log"
 	"net/url"
 	"os"
 	"path"
@@ -77,11 +76,13 @@ func (app *HtmlApplication) NewWatcher(quitChan chan bool) {
 
 	app.watcher, err = fsnotify.NewWatcher()
 	if err != nil {
+		logger.Infoln("Could not create new auto-reload watcher:", err)
 		return
 	}
 	err = app.watcher.Watch(app.RootFolder())
 	if err != nil {
-		log.Fatal(err)
+		logger.Infoln("Could not start auto-reload watcher:", err)
+		return
 	}
 	for _, folder := range app.RecursiveFolders() {
 		fullPath := app.RootFolder() + "/" + folder.Name()
-- 
cgit