summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.go9
-rw-r--r--main.go5
2 files changed, 4 insertions, 10 deletions
diff --git a/config.go b/config.go
index d751a7b..cf3ae1e 100644
--- a/config.go
+++ b/config.go
@@ -40,22 +40,19 @@ type systrayConfig struct {
SelectWateway bool
}
-func parseConfig() (*systrayConfig, error) {
+func parseConfig() *systrayConfig {
var conf systrayConfig
f, err := os.Open(configPath)
- if os.IsNotExist(err) {
- return &conf, nil
- }
if err != nil {
- return nil, err
+ return &conf
}
defer f.Close()
dec := json.NewDecoder(f)
err = dec.Decode(&conf)
conf.parseFlags()
- return &conf, err
+ return &conf
}
func (c *systrayConfig) parseFlags() {
diff --git a/main.go b/main.go
index d483c26..95f8ff4 100644
--- a/main.go
+++ b/main.go
@@ -30,10 +30,7 @@ const (
var printer *message.Printer
func main() {
- conf, err := parseConfig()
- if err != nil {
- log.Fatal(err)
- }
+ conf := parseConfig()
initPrinter()
notify := newNotificator(conf)