From 21d86ca486a88c936a1fe71f78d76c78df36a7eb Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Thu, 26 Jun 2014 16:26:14 +0100
Subject: gui stop - introduce gui.Stop() - remember state with open - stopping
 ethereum stack is not gui concern, moved to main - stopping mining, gui and
 ethereum handled via interrupt callbacks - ^C triggers exactly the same
 behaviour as quit via menu

---
 utils/cmd.go | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'utils')

diff --git a/utils/cmd.go b/utils/cmd.go
index da05c6d83..db5ec5b48 100644
--- a/utils/cmd.go
+++ b/utils/cmd.go
@@ -32,13 +32,17 @@ func HandleInterrupt() {
     signal.Notify(c, os.Interrupt)
     for sig := range c {
       logger.Errorf("Shutting down (%v) ... \n", sig)
-      for _, cb := range interruptCallbacks {
-        cb(sig)
-      }
+      RunInterruptCallbacks(sig)
     }
   }()
 }
 
+func RunInterruptCallbacks(sig os.Signal) {
+  for _, cb := range interruptCallbacks {
+    cb(sig)
+  }
+}
+
 func AbsolutePath(Datadir string, filename string) string {
   if path.IsAbs(filename) {
     return filename
@@ -94,6 +98,7 @@ func InitLogging (Datadir string, LogFile string, LogLevel int, DebugFile string
 }
 
 func InitConfig(ConfigFile string, Datadir string, Identifier string, EnvPrefix string) {
+  InitDataDir(Datadir)
   ethutil.ReadConfig(ConfigFile, Datadir, Identifier, EnvPrefix)
   ethutil.Config.Set("rpcport", "700")
 }
@@ -120,8 +125,6 @@ func StartEthereum(ethereum *eth.Ethereum, UseSeed bool) {
     ethereum.Stop()
     ethlog.Flush()
   })
-  // this blocks the thread
-  ethereum.WaitForShutdown()
 }
 
 func ShowGenesis(ethereum *eth.Ethereum) {
-- 
cgit v1.2.3