Merge branch 'load-from-xdg-config' into timetasker-daily

2 files changed, 5 insertions, 4 deletions

diff --git a/config.go b/config.go
index 43f7689..126b123 100644
--- a/config.go
+++ b/config.go
@@ -67,7 +67,7 @@ func maybeWriteConfig() error {
 
 func loadConfig() error {
 	config = Config{}
-	_, err := toml.DecodeFile("config2.toml", &config)
+	_, err := toml.DecodeFile(configFile(), &config)
 	if err != nil {
 		return err
 	}
diff --git a/main.go b/main.go
index ab0fc4a..f067867 100644
--- a/main.go
+++ b/main.go
@@ -19,9 +19,6 @@ var config Config
 func main() {
 	var err error
 
-	err = loadConfig()
-	kingpin.FatalIfError(err, "Could not load config file")
-
 	// Parse command line arguments
 	project_alias := kingpin.Flag(
 		"project",
@@ -58,6 +55,10 @@ func main() {
 
 		os.Exit(0)
 	}
+
+	err = loadConfig()
+	kingpin.FatalIfError(err, "could not load config file, try --write-config")
+
 	// Submit time entry
 	project, ok := config.Projects[*project_alias]
 	if !ok {